1
0
qng 3 rokov pred
rodič
commit
6e1b56e53b

+ 5 - 6
kmall-admin/src/main/java/com/kmall/admin/controller/OrderProcessRecordExternalController.java

@@ -50,15 +50,14 @@ public class OrderProcessRecordExternalController {
             String key = sysConfigService.getValueHk("HK_NOTICE_KEY");
             Integer dataNum = Integer.valueOf(sysConfigService.getValueHk("HK_NOTICE_NUM"));
             if(strSign.equals("")||timestamp.equals("")){
-                return Message.error("1001","参数错误");
-
+                return Message.error("120101","参数错误");
             }
             if(!strSign.equals(checkMsg(timestamp,key))){
-                return Message.error("1003","签名错误");
+                return Message.error("120102","签名错误");
             }
             List<OrderProcessRecordEntity> orderProcessRecordList = orderProcessRecordHkEntity.getRecordHkList();
             if(orderProcessRecordList.size()>dataNum){
-                return Message.error("1003","通知数据最多"+dataNum+"条,请分批通知");
+                return Message.error("120105","通知数据最多"+dataNum+"条,请分批通知");
             }
             // 根据指定属性分组,并统计数量(key:指定属性,value:数量)
             Map<Object, Long> mapGroup = orderProcessRecordList.stream().collect(Collectors.groupingBy(recordEntity -> recordEntity.getOrderSn(), Collectors.counting()));
@@ -66,12 +65,12 @@ public class OrderProcessRecordExternalController {
             Stream<Object> stringStream = mapGroup.entrySet().stream().filter(entry -> entry.getValue() > 1).map(entry -> entry.getKey());
             Long num = stringStream.count();
             if(num>0L){
-                return Message.error("1003","订单数据存在重复");
+                return Message.error("120103","订单数据存在重复");
             }
             return orderProcessRecordService.saveHkNoticeMsg(orderProcessRecordList);
         }catch (Exception e){
             logger.error("hknoticeMsg---订单流转信息回调通知接口数据="+ JSON.toJSONString(outRequestMessage),e);
-            return Message.error("1001","参数错误");
+            return Message.error("120101","参数错误");
         }
     }
 

+ 3 - 3
kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderProcessRecordServiceImpl.java

@@ -168,14 +168,14 @@ public class OrderProcessRecordServiceImpl implements OrderProcessRecordService
        try{
            Integer count = orderProcessRecordDao.queryHkOrderTotal(orderProcessRecordList);
            if(orderProcessRecordList.size()!=count){
-               return Message.success("1003","订单不存在");
+               return Message.success("120104","订单不存在");
            }else{
                orderProcessRecordDao.updateHkNoticeMsg(orderProcessRecordList);
            }
        }catch (Exception e){
            logger.error("saveHkNoticeMsg---海控通知回调接口插入错误="+ JSON.toJSONString(orderProcessRecordList),e);
-           return Message.success("1001","参数错误");
+           return Message.success("120101","参数错误");
        }
-        return Message.success("1002","通知成功");
+        return Message.success("120100","成功");
     }
 }