优化代码

src/main/java/cn/chjyj/szwh/job/OrderJob.java

@@ -16,7 +16,7 @@ import java.util.Calendar;
  * 关闭超时订单脚本
  */
 public class OrderJob extends QuartzJobBean {
-    private static Log log = LogFactory.getLog(SzwhRevocationGoodsJob.class);
+    private static Log log = LogFactory.getLog(OrderJob.class);
     @Autowired
     private OrderTaskService orderTaskService;
 

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

@@ -475,18 +475,16 @@ public class GoodsServiceImpl implements GoodsService {
                         log.info("更新后的sort："+afterSort);
                         // 前序变更recommend sort
                         goodsMapper.updateRecommend(tmpRanklist.get(i-1).getGoodsIslicode(),curSort);
-                        ret = goodsMapper.updateRecommend(tmpRanklist.get(i).getGoodsIslicode(),afterSort);
+                        ret = goodsMapper.updateRecommend(goodsIsli,afterSort);
                     }
                 }else{
-                    if(i==tmpRanklist.size()-1){
-                        break;
-                    }else{
+                    if(i<tmpRanklist.size()){
                         //前序sort
                         int frontSort = tmpRanklist.get(i+1).getRecommendSort();
                         int afterSort= (frontSort==curSort)?curSort-1:frontSort;
                         // 前序变更recommend sort
                         goodsMapper.updateRecommend(tmpRanklist.get(i+1).getGoodsIslicode(),curSort);
-                        ret = goodsMapper.updateRecommend(tmpRanklist.get(i).getGoodsIslicode(), afterSort);
+                        ret = goodsMapper.updateRecommend(goodsIsli, afterSort);
                     }
                 }
             }
@@ -664,6 +662,7 @@ public class GoodsServiceImpl implements GoodsService {
                     goods.setUserIslicode(targetJson.getString("identifier"));
                     goods.setUsername(targetJson.getString("titleName"));
                     goods.setIsLicode(sdjson.getString("isliCode"));
+                    // sourceData中的identifier
                     goods.setGoodsIslicode(nsdjson.getString("identifier"));
                     goods.setIsRecommend(0);
                     goods.setRecommendSort(1); // 默认排序1

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

@@ -14,7 +14,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 @Service
 @Transactional
@@ -82,27 +84,41 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
                 Goods dbgoods =goodsMapper.getGoodsByIsliCode(islicode);
                 String opmsg="";//操作信息
                 if(dbgoods!=null){
+                    OperationLog oplog = new OperationLog();
+                    oplog.setType("goods");
+                    oplog.setLogid(dbgoods.getId());
+
                     String nowstr=sdf.format(new Date())+" ";
                     //审核通过,更新对应的状态
                     if(verifyStatus==1){
-                        int apout = dbgoods.getApplyOut()==1?1:0;
-                        String tmsg =(apout==1)?"申请撤销委托审核通过":"委托系统撤销委托";
-                        opmsg=nowstr+tmsg;
+                        // 商品状态
+                        Integer gstatusArr[]={1,5};
+                        List<Integer> gslist = Arrays.asList(gstatusArr);
+                        //申请撤销委托
+                        if(dbgoods.getApplyOut()==1){
+                            int ret =goodsMapper.updateGoodsField("goods_status","2",islicode);
+                            //todo order操作订单
+                            opmsg = nowstr+"申请撤销委托审核通过";
+                            oplog.setMessage(opmsg);
+                            operationLogMapper.addLog(oplog);
+                        }else{
+                            if(gslist.contains(dbgoods.getGoodsStatus())){
+                                goodsMapper.updateGoodsField("goods_status","2",islicode);
+                                goodsMapper.updateGoodsField("apply_out","1",islicode);
+                                opmsg = nowstr+"委托系统撤销委托";
+                                oplog.setMessage(opmsg);
+                                operationLogMapper.addLog(oplog);
+                            }
+                        }
                     }else{
-                        opmsg=nowstr+"委托系统撤销委托";
-                    }
-                    //apply_out 为0时候, 执行代码
-                    if(dbgoods.getApplyOut()==0){
-                        //更新状态
-                        goodsMapper.updateRevocationGoods(dbgoods.getId().toString());
-                        //构建操作日志
-                        OperationLog oplog = new OperationLog();
-                        oplog.setType("goods");
-                        oplog.setLogid(dbgoods.getId());
+                        //申请撤销委托审核不通过
+                        if(dbgoods.getApplyOut()==1){
+                            goodsMapper.updateGoodsField("apply_out","0",islicode);
+                        }
+                        opmsg = nowstr+"申请撤销委托审核不通过";
                         oplog.setMessage(opmsg);
                         operationLogMapper.addLog(oplog);
                     }
-
                 }
             }
         }