修改代码

src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java

@@ -104,22 +104,21 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
                         List<Integer> gslist = Arrays.asList(gstatusArr);
                         //申请撤销委托
                         if (dbgoods.getApplyOut() == 1 && dbgoods.getGoodsStatus() != 2) {
-                            int ret =goodsMapper.updateGoodsField("goods_status","2",gid);
+                            int ret = goodsMapper.updateGoodsFieldInId("goods_status", "2", gid);
+                            if (ret == 1) {
                                 log.info("申请撤销委托：" + islicode);
                                 //todo order操作订单
                                 opmsg = nowstr + "申请撤销委托审核通过";
                                 oplog.setMessage(opmsg);
                                 operationLogMapper.addLog(oplog);
                             } else {
-                            if(gslist.contains(dbgoods.getGoodsStatus()) && dbgoods.getGoodsStatus()!=2){
                                 log.info("委托系统：" + islicode);
-                                goodsMapper.updateGoodsField("goods_status","2",gid);
-                                goodsMapper.updateGoodsField("apply_out","1",gid);
+                                goodsMapper.updateGoodsFieldInId("goods_status", "2", gid);
+                                goodsMapper.updateGoodsFieldInId("apply_out", "1", gid);
                                 opmsg = nowstr + "委托系统撤销委托";
                                 oplog.setMessage(opmsg);
                                 operationLogMapper.addLog(oplog);
                             }
-                        }
                         } else {
                             //申请撤销委托审核不通过
                             if (dbgoods.getApplyOut() == 1) {
@@ -133,5 +132,7 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
                     }
                 }
             }
+
+        }
     }
 }