Merge branch 'feature/20200423_订单oms逆向流程' into develop

order-application-service/pom.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>structure-center-sdk</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.2.RELEASE</version>
         </dependency>
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>

order-management/pom.xml

@@ -64,7 +64,7 @@
         <dependency>
             <artifactId>structure-center-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2.2.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/adapter/MessagePushAdapter.java

 package cn.freemud.management.adapter;
 
+import cn.freemud.management.enums.MessageCenterCmdType;
 import cn.freemud.management.enums.OperateType;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
@@ -36,6 +37,32 @@ public class MessagePushAdapter {
         return pushMessageNoticeDto;
     }
 
+    public PushMessageNoticeDto convent2PushMessageNoticeDto1(QueryOrdersResponse.DataBean.OrderBean order) {
+        PushMessageNoticeDto pushMessageNoticeDto = new PushMessageNoticeDto();
+        pushMessageNoticeDto.setPartnerId(order.getCompanyId());
+        pushMessageNoticeDto.setStoreId(order.getShopId());
+        pushMessageNoticeDto.setTargetId(order.getUserId());
+        pushMessageNoticeDto.setTargetType(2);
+        pushMessageNoticeDto.setCmd(MessageCenterCmdType.JIEDAN_DAYIN_TIXING.getCmd());
+        pushMessageNoticeDto.setTtl(0);
+        pushMessageNoticeDto.setVer("1");
+        PushMessageNoticeDto.Message message = new PushMessageNoticeDto.Message();
+        message.setType(1);
+        PushMessageNoticeDto.Message.Content content = new PushMessageNoticeDto.Message.Content();
+        content.setOid(order.getOid());
+        OrderExtInfoDto extInfo = JSONObject.parseObject(order.getExtInfo(), OrderExtInfoDto.class);
+        if (extInfo != null) {
+            content.setFromAppId(extInfo.getFromAppId());
+        }
+        //content.setDeliveryStatus(deliveryStatus);
+        content.setPickUpGoodsNo(order.getOtherCode());
+        content.setUserId(order.getUserId());
+        content.setOrderState(order.getStatus());
+        message.setContent(content);
+        pushMessageNoticeDto.setData(JSONObject.toJSONString(message));
+        return pushMessageNoticeDto;
+    }
+
     public MessageTemplateRequest<MessagePushOrderTemplateRequest> convent2MessageTemplateRequest(QueryOrdersResponse.DataBean.OrderBean order, String reason, OperateType opType) {
         OrderExtInfoDto extInfo = JSONObject.parseObject(order.getExtInfo(), OrderExtInfoDto.class);
         if (extInfo==null){

order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java

@@ -5,8 +5,10 @@ import cn.freemud.management.enums.DeliveryStatus;
 import cn.freemud.management.enums.MessageCenterCmdType;
 import cn.freemud.management.enums.OperateType;
 import cn.freemud.management.enums.OrderSource;
+import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
 import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
 import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
@@ -55,7 +57,7 @@ public class OrderBaseService {
         //发送消息到pos消息中心
         PushMessageNoticeDto pushMessageNoticeDto1 = null;
         try {
-            pushMessageNoticeDto1 = messagePushAdapter.convent2PushMessageNoticeDto(2, orderBean.getCompanyId(), orderBean.getShopId(), null, orderBean.getOid(), null, MessageCenterCmdType.JIEDAN_DAYIN_TIXING.getCmd());
+            pushMessageNoticeDto1 = messagePushAdapter.convent2PushMessageNoticeDto1(orderBean);
             messageCenterClient.createMessage(pushMessageNoticeDto1, LogThreadLocal.getTrackingNo());
         } catch (Exception e) {
             ErrorLog.printErrorLog("sendMessageCenterError", "", pushMessageNoticeDto1, e);

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -64,7 +64,7 @@ public class OrderVerifyHandle {
         if (!OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_CANNOT_CONFIRM, getOrderManagerResponse(orderBean));
         }
-        return commonVerify(orderBean, request);
+        return ResponseUtil.success();
     }
 
     /**
@@ -97,7 +97,7 @@ public class OrderVerifyHandle {
         if (!OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
             return ResponseUtil.error(ResponseResult.DELIVERY_SEND_STATUS_NOTAKE, getOrderManagerResponse(orderBean));
         }
-        return commonVerify(orderBean, request);
+        return ResponseUtil.success();
     }
 
 
@@ -160,7 +160,7 @@ public class OrderVerifyHandle {
         if (isWaimai(orderBean) && ObjectUtils.notEqual(OrderStatus.DISTRIBUTION.getCode(), orderBean.getStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_FAILED, getOrderManagerResponse(orderBean));
         }
-        return commonVerify(orderBean, request);
+        return ResponseUtil.success();
     }
 
     /**
@@ -194,7 +194,7 @@ public class OrderVerifyHandle {
         if (!OrderStatus.TAKE_ORDER.getCode().equals(status)) {
             return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_NOT_NEW, getOrderManagerResponse(orderBean));
         }
-        return commonVerify(orderBean, request);
+        return ResponseUtil.success();
     }
 
     /**
@@ -226,7 +226,7 @@ public class OrderVerifyHandle {
         if (isCanRefund) {
             orderBean.setAmount(getRefundAmount(orderBean).longValue());
         }
-        return commonVerify(orderBean, request);
+        return ResponseUtil.success();
     }
 
     /**
@@ -255,7 +255,7 @@ public class OrderVerifyHandle {
                 || OrderStatus.CANCEL.getCode().equals(orderBean.getStatus()))) {
             return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_STATUS_END);
         }
-        return commonVerify(orderBean, request);
+        return ResponseUtil.success();
     }
 
     /**

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -65,5 +65,9 @@ public class OrderExtInfoDto {
      *  版本号
      */
     private String version;
+    /**
+     * 来源appId
+     */
+    private String fromAppId;
 
 }