撤销订单

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

@@ -350,33 +350,35 @@ public class GoodsServiceImpl implements GoodsService {
         }
         // 满足上述条件后进行远程处理
         JSONObject retjson = SzwhApiUtils.offGoods(reason,goodsIsli);
+        log.info("remote offgoods result:"+retjson.toString());
         String errorcode =retjson.getString("resultCode");
         String errmsg = retjson.getString("resultMsg");
         if(!"00000000".equals(errorcode)){
             msg= errmsg;
+            code=400;
+        }else {
+            // 更新状态
+            Map gmap = new HashMap();
+            gmap.put("apply_out", 1);
+            int upret = goodsMapper.updateGoods(gmap, goods.getId());
+            log.info("local db result:" + upret);
+
+            // 操作日志
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String message = sdf.format(new Date()) + "由" + username + "申请撤销委托，撤销原因：" + reason;
+            OperationLog oplog = new OperationLog();
+            oplog.setLogid(goods.getId());
+            oplog.setType("goods");
+            oplog.setMessage(message);
+            operationLogMapper.addLog(oplog);
+            //
+            msg="成功";
+            code=200;
         }
-        // 更新状态
-        Map gmap = new HashMap();
-        gmap.put("apply_out",1);
-        int upret = goodsMapper.updateGoods(gmap,goods.getId());
-
-        //提交远程
-        JSONObject rjson =SzwhApiUtils.offGoods(reason,goodsIsli);
-        log.info("remote offgoods result:"+rjson.toString());
-
         // 返回的map 集合
         Map retmap = new HashMap();
         retmap.put("code",code);
         retmap.put("msg",msg);
-        // 操作日志
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String message=sdf.format(new Date())+"由"+username+"申请撤销委托，撤销原因："+reason;
-        OperationLog oplog = new OperationLog();
-        oplog.setLogid(goods.getId());
-        oplog.setType("goods");
-        oplog.setMessage(message);
-        operationLogMapper.addLog(oplog);
-
         return retmap;
     }