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