Merge branch 'feature/通知回调接口以及退款功能1124'

kmall-admin/src/main/java/com/kmall/admin/controller/OrderProcessRecordExternalController.java

@@ -2,6 +2,7 @@ package com.kmall.admin.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.kmall.admin.entity.OrderProcessRecordEntity;
+import com.kmall.admin.entity.OrderProcessRecordHkEntity;
 import com.kmall.admin.fromcomm.service.SysConfigService;
 import com.kmall.admin.haikong.utils.Message;
 import com.kmall.admin.haikong.utils.OutRequestMessage;
@@ -42,21 +43,21 @@ public class OrderProcessRecordExternalController {
     @PostMapping("/hkNotice")
     public Message hknoticeMsg(@RequestBody OutRequestMessage outRequestMessage) {
         try{
-            List<OrderProcessRecordEntity> orderProcessRecordList  = JacksonUtil.fromStringJson(outRequestMessage.getData(), List.class);
+            OrderProcessRecordHkEntity orderProcessRecordHkEntity  = JacksonUtil.fromStringJson(outRequestMessage.getData(), OrderProcessRecordHkEntity.class);
             //签名验证
             String strSign =outRequestMessage.getSign()==null?"":outRequestMessage.getSign();
             String timestamp = outRequestMessage.getTimestamp()==null?"":outRequestMessage.getTimestamp();
             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()));
@@ -64,20 +65,14 @@ 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","参数错误");
         }
     }
 
-    @RequestMapping("/users")
-    public String test() {
-        return "qwqwq";
-    }
-
-
 
 }

kmall-admin/src/main/java/com/kmall/admin/entity/OrderProcessRecordHkEntity.java

@@ -0,0 +1,14 @@
+package com.kmall.admin.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class OrderProcessRecordHkEntity implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    List<OrderProcessRecordEntity> recordHkList;
+}

kmall-admin/src/main/java/com/kmall/admin/haikong/utils/Message.java

@@ -18,7 +18,6 @@ public class Message implements Serializable {
 
 	private static final long serialVersionUID = 4081619286503989887L;
 
-	private boolean isSuccess;
 
 	/**
 	 * 消息代码 , 由使用者自由发挥
@@ -28,10 +27,6 @@ public class Message implements Serializable {
 	 * 消息内容体 , 由使用者自由发挥
 	 */
 	private String msg;
-	/**
-	 * 扩展
-	 */
-	private Object extend;
 
 	private Message() {
 	}
@@ -42,12 +37,6 @@ public class Message implements Serializable {
 	public String getMsg() {
 		return msg;
 	}
-	public Object getExtend() {
-		return extend;
-	}
-	public boolean isSuccess() {
-		return isSuccess;
-	}
 
 	public static Builder builder() {
 		return new Builder();
@@ -141,10 +130,8 @@ public class Message implements Serializable {
 
 		public Message build() {
 			Message message = new Message();
-			message.isSuccess = this.isSuccess;
 			message.code = this.code;
 			message.msg = this.msg;
-			message.extend = this.extend;
 			return message;
 		}
 

kmall-admin/src/main/java/com/kmall/admin/haikong/utils/ResponseMessage.java

@@ -48,7 +48,7 @@ public class ResponseMessage {
     public static ResponseMessage transResponseMessage(Object object) {
         if (object instanceof Message) {
             Message message = (Message) object;
-            return new Builder(message.getCode(), message.getMsg(), message.getExtend(), Object.class).build();
+            return new Builder(message.getCode(), message.getMsg(), Object.class).build();
         } else if (object instanceof Result) {
             Result result = (Result) object;
             return new Builder(result.getCode(), result.getMsg(), result.getData(), Object.class).build();

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));
-           return Message.success("1001","参数错误");
+           logger.error("saveHkNoticeMsg---海控通知回调接口插入错误="+ JSON.toJSONString(orderProcessRecordList),e);
+           return Message.success("120101","参数错误");
        }
-        return Message.success("1002","通知成功");
+        return Message.success("120100","成功");
     }
 }

kmall-admin/src/main/resources/mybatis/mapper/OrderProcessRecordDao.xml

@@ -326,7 +326,7 @@ select
 		from mall_order_process_record
 		where
 		<if test="list != null">
-			and order_sn in
+			 order_sn in
 			<foreach collection="list" item="item" open="(" separator="," close=")">
 				#{item.orderSn}
 			</foreach>