Merge branch 'revert-b3c0ff69' into 'master'

Revert "交易单修改时自动转移支付bug"

See merge request !2

precision-effect-system/src/main/java/com/zehong/system/service/impl/TTradeProjectServiceImpl.java

@@ -165,8 +165,8 @@ public class TTradeProjectServiceImpl implements ITTradeProjectService
     public int updateTTradeProject(TTradeProject tTradeProject)
     {
         TTradeProject trade = tTradeProjectMapper.selectTTradeProjectById(tTradeProject.getTradeId());
-        // 转移支付：新增交易转移信息，更新交易单。（交易单新增或修改时状态值为null）
-        if(tTradeProject.getTradeStatus() != null && tTradeProject.getTradeDeptId()!=null && tTradeProject.getTradeTransactor()!=null){
+        // 转移支付：新增交易转移信息，更新交易单
+        if("0".equals(tTradeProject.getTradeStatus()) && tTradeProject.getTradeDeptId()!=null && tTradeProject.getTradeTransactor()!=null){
             TTradeChangeInfo tradeChangeInfo = new TTradeChangeInfo();
             tradeChangeInfo.setRelationTradeId(tTradeProject.getTradeId());
             tradeChangeInfo.setOriginalTradeDeptId(trade.getTradeDeptId());

precision-effect-web/src/views/trade/index.vue

@@ -612,8 +612,6 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          // 为区分转移支付，新增和修改时交易单状态传值设为null，新增时数据库默认‘0’
-          this.form.tradeStatus = null;
           if (this.form.tradeId != null) {
             updateProject(this.form).then((response) => {
               this.msgSuccess("修改成功");