From ffb8c7e2e6afdc78195c6d259080ca654a7dd891 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Sat, 15 Oct 2022 00:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GoodsTaskServiceImpl.java    | 87 ++++++++++---------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java
index 96e4163..34a9984 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java
@@ -38,23 +38,23 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
         //获取接口数据
         JSONObject recvjson = SzwhApiUtils.revocationGoods();
         //提取返回数据中的data 字段
-        String datajsonStr= recvjson.getString("data");
-        if(StringUtils.isNotBlank(datajsonStr)){
+        String datajsonStr = recvjson.getString("data");
+        if (StringUtils.isNotBlank(datajsonStr)) {
             JSONArray jsonArray = JSONArray.parseArray(datajsonStr);
-            for(int i=0;i<jsonArray.size();i++){
+            for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject jitem = (JSONObject) jsonArray.get(i);
                 String islicode = jitem.getString("isliCode");
                 //查询是否存在商品
-                Goods dbgoods =goodsMapper.getGoodsByIsliCode(islicode);
+                Goods dbgoods = goodsMapper.getGoodsByIsliCode(islicode);
                 // 如果商品存在，执行撤销操作
-                if(dbgoods!=null && dbgoods.getApplyOut()==0){
+                if (dbgoods != null && dbgoods.getApplyOut() == 0) {
                     //更新状态
                     goodsMapper.updateRevocationGoods(dbgoods.getId().toString());
                     //构建操作日志
                     OperationLog oplog = new OperationLog();
                     oplog.setType("goods");
                     oplog.setLogid(dbgoods.getId());
-                    oplog.setMessage(sdf.format(new Date())+" 发布投送系统撤销委托");
+                    oplog.setMessage(sdf.format(new Date()) + " 发布投送系统撤销委托");
                     operationLogMapper.addLog(oplog);
                 }
             }
@@ -70,68 +70,69 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
         // 接口查询撤销数据
         JSONObject recvjson = SzwhApiUtils.queryGoodsStatus();
         //提取返回数据中的data 字段
-        String datajsonStr= recvjson.getString("data");
-        if(StringUtils.isNotBlank(datajsonStr)){
+        String datajsonStr = recvjson.getString("data");
+        if (StringUtils.isNotBlank(datajsonStr)) {
             JSONArray jsonArray = JSONArray.parseArray(datajsonStr);
-            for(int i=0;i<jsonArray.size();i++){
+            for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject jitem = (JSONObject) jsonArray.get(i);
                 String islicode = jitem.getString("isliCode");
                 //1:委托自己撤销,2:交易撤销
-                int revokeStatus= jitem.getInteger("revokeStatus");
+                int revokeStatus = jitem.getInteger("revokeStatus");
                 //审核状态：0,未审核,1，通过；2，不通过
-                int verifyStatus=jitem.getInteger("verifyStatus");
-                if(verifyStatus==0){ //待审核
+                int verifyStatus = jitem.getInteger("verifyStatus");
+                if (verifyStatus == 0) { //待审核
                     continue;
                 }
                 //查询是否存在商品
-                Goods dbgoods =goodsMapper.getGoodsByIsliCode(islicode);
-                String opmsg="";//操作信息
-                if(dbgoods!=null){
+                Goods dbgoods = goodsMapper.getGoodsByIsliCode(islicode);
+                String opmsg = "";//操作信息
+                if (dbgoods != null) {
                     // 已经更新的，不再处理
-                    if(dbgoods.getApplyOut()==1 && dbgoods.getGoodsStatus()==2){
+                    if (dbgoods.getApplyOut() == 1 && dbgoods.getGoodsStatus() == 2) {
                         continue;
                     }
                     OperationLog oplog = new OperationLog();
                     oplog.setType("goods");
                     oplog.setLogid(dbgoods.getId());
 
-                    String nowstr=sdf.format(new Date())+" ";
+                    String nowstr = sdf.format(new Date()) + " ";
                     //审核通过,更新对应的状态
-                    if(verifyStatus==1){
-                        String gid=dbgoods.getId().toString();
+                    if (verifyStatus == 1) {
+                        String gid = dbgoods.getId().toString();
                         // 商品状态
-                        Integer gstatusArr[]={1,5};
+                        Integer gstatusArr[] = {1, 5};
                         List<Integer> gslist = Arrays.asList(gstatusArr);
                         //申请撤销委托
-                        if(dbgoods.getApplyOut()==1 && dbgoods.getGoodsStatus()!=2){
-                            int ret =goodsMapper.updateGoodsField("goods_status","2",gid);
-                            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);
-                                opmsg = nowstr+"委托系统撤销委托";
+                        if (dbgoods.getApplyOut() == 1 && dbgoods.getGoodsStatus() != 2) {
+                            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 {
+                                log.info("委托系统：" + islicode);
+                                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) {
+                                goodsMapper.updateGoodsField("apply_out", "0", islicode);
+                            }
+                            log.info("申请撤销委托审核不通过：" + islicode);
+                            opmsg = nowstr + "申请撤销委托审核不通过";
+                            oplog.setMessage(opmsg);
+                            operationLogMapper.addLog(oplog);
                         }
-                    }else{
-                        //申请撤销委托审核不通过
-                        if(dbgoods.getApplyOut()==1){
-                            goodsMapper.updateGoodsField("apply_out","0",islicode);
-                        }
-                        log.info("申请撤销委托审核不通过："+islicode);
-                        opmsg = nowstr+"申请撤销委托审核不通过";
-                        oplog.setMessage(opmsg);
-                        operationLogMapper.addLog(oplog);
                     }
                 }
             }
+
         }
     }
-}
+}
\ No newline at end of file