Merge branch 'feature/rui.zhu/2023-02-13/订阅消息优化'

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -32,10 +32,7 @@ import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
 import com.freemud.application.sdk.api.ordercenter.enums.PayType;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
 import com.freemud.application.sdk.api.ordercenter.util.LogUtil;
 import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
 import com.freemud.sdk.api.assortment.orderdistributor.service.OrderDistributionService;
@@ -390,8 +387,8 @@ public class OrderCallBackMQService {
             if (Objects.isNull(body) || StringUtils.isEmpty(body.getContent())) {
                 return;
             }
-            // 正常变化  订单正向操作
-            if (body.getOperateType() == 1 && "1".equals(body.getMsgType())) {
+            // 订单所有状态正常变化通知
+            if ("1".equals(body.getMsgType())) {
                 Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
                         OrderCallBackConfig.ORDER_STATUS_PROCESS_CENTER_QUEUE_ROUTING_KEY, OrderCallBackConfig.ORDER_STATUS_PROCESS_CENTER_QUEUE);
                 MQMessage<OrderCallBackRequestVo> message = new MQMessage<>(header, body);

order-application-service/src/main/java/cn/freemud/controller/ExposureOrderController.java

@@ -76,7 +76,6 @@ public class ExposureOrderController {
     @ApiAnnotation(logMessage = "发送支付成功模板消息")
     @PostMapping("/sendPayTemplateMessage")
     public BaseResponse sendPayTemplateMessage(@Validated @LogParams @RequestBody SendPaySuccessMessageVo sendPaySuccessMessageVo) {
-        orderService.sendMessageByNewApp(sendPaySuccessMessageVo);
         return ResponseUtil.success();
     }
 

order-application-service/src/main/java/cn/freemud/service/impl/EvaluationServiceImpl.java

@@ -60,7 +60,7 @@ public class EvaluationServiceImpl implements EvaluationService {
         try {
             QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo("", request.getOrderId(), "", null, LogThreadLocal.getTrackingNo(),request.getPartnerId());
             if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "") || orderDetailResponse.getResult() == null) {
-                return ResponseUtil.success(ResponseResult.ORDER_NOT_EXIST);
+                return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
             }
             OrderInfoReqs orderInfo = orderDetailResponse.getResult();
 

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -64,7 +64,6 @@ import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.AfterSalesRefunStateEnum;
 import cn.freemud.management.enums.SettlementTypeEnum;
 import cn.freemud.management.intercept.OrderServiceException;
-import cn.freemud.management.service.adapter.OrderManagerAdapter;
 import cn.freemud.management.service.handle.OrderVerifyHandle;
 import cn.freemud.management.service.handle.PaymentHandle;
 import cn.freemud.management.service.handle.StockHandle;
@@ -89,7 +88,6 @@ import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.AssortmentCloudPrinterManager;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerConfigManager;
-import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappAuthorizerManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
 import com.freemud.application.sdk.api.constant.ResponseConstant;
@@ -421,8 +419,6 @@ public class OrderServiceImpl implements Orderservice {
             String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : "";
             orderBean.setAddress(storeAddress);
             orderBean.setOtherCode(takeCode);
-            //发送支付成功模板消息
-            this.sendPaySuccessMessage(orderBean);
         }
         // 有云打印机 打印小票，杯贴
         try {
@@ -1974,43 +1970,6 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     /**
-     * 发送支付成功模板消息
-     *
-     * @param orderBean
-     */
-    private void sendPaySuccessMessage(OrderBeanV1 orderBean) {
-        Long gmtExpect = orderBean.getGmtExpect();
-        if (gmtExpect != null) {
-            // 预约下单
-            this.sendMessage(orderBean, MessageEventType.PAYORDEREXPECT);
-        } else {
-            // 非预约下单
-            this.sendMessage(orderBean, MessageEventType.PAYORDER);
-        }
-    }
-
-    /**
-     * 发送模板消息
-     *
-     * @param orderBean
-     * @param messageEventType
-     */
-    private void sendMessage(OrderBeanV1 orderBean, MessageEventType messageEventType) {
-        MessageTemplateRequest<MessagePushOrderTemplateRequest> messageTemplateRequest = null;
-        try {
-            messageTemplateRequest = messageNoticeAdapter.convent2MessageTemplateRequest(orderBean);
-            messageTemplateRequest.setMessageEventType(messageEventType);
-            com.freemud.application.sdk.api.base.BaseResponse baseResponse = this.messageTemplatePushService.sendTemplateMsg(messageTemplateRequest);
-            if (!Objects.equals(baseResponse.getCode(), ResponseResultEnum.SUCCESS.getCode())) {
-                AppLogUtil.printLog("发送支付成功模板消息 失败", orderBean.getOid(), JSON.toJSONString(baseResponse));
-            }
-        } catch (Exception e) {
-            AppLogUtil.errorLog("sendTemplateMsg_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(messageTemplateRequest), e);
-        }
-    }
-
-
-    /**
      * 获取商品第三方商品编号
      *
      * @param createOrderDto
@@ -3356,28 +3315,4 @@ public class OrderServiceImpl implements Orderservice {
         }
         return ResponseUtil.success(userLoginInfoDto);
     }
-
-    /**
-     * 发送支付成功模板消息
-     */
-    public void sendMessageByNewApp(SendPaySuccessMessageVo sendPaySuccessMessageVo) {
-        OrderBeanV1 orderBean = new OrderBeanV1();
-        orderBean.setCompanyId(sendPaySuccessMessageVo.getPartnerId());
-        orderBean.setAddress(sendPaySuccessMessageVo.getAddress());
-        orderBean.setDaySeq(sendPaySuccessMessageVo.getDaySeq());
-        orderBean.setGmtExpect(sendPaySuccessMessageVo.getGmtExpect());
-        orderBean.setShopName(sendPaySuccessMessageVo.getStoreName());
-        orderBean.setGmtCreate(sendPaySuccessMessageVo.getGmtCreate());
-        orderBean.setOid(sendPaySuccessMessageVo.getOrderCode());
-        orderBean.setOrderType(sendPaySuccessMessageVo.getOrderType());
-        orderBean.setOtherCode(sendPaySuccessMessageVo.getOtherCode());
-        orderBean.setAmount(sendPaySuccessMessageVo.getAmount());
-        OrderExtInfoDto extInfoDto = JSON.parseObject(sendPaySuccessMessageVo.getExtInfo(), OrderExtInfoDto.class);
-        extInfoDto.setAppid(extInfoDto.getAppid());
-        extInfoDto.setOpenid(extInfoDto.getOpenid());
-        extInfoDto.setPrepayId(extInfoDto.getPrepayId());
-        orderBean.setExtInfo(JSON.toJSONString(extInfoDto));
-        this.sendPaySuccessMessage(orderBean);
-    }
-
 }

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

@@ -66,23 +66,21 @@ public class OrderBaseService {
             ErrorLog.printErrorLog("sendMessageCenterError", "", pushMessageNoticeDto1, e);
         }
         //发送微信模板消息
-        if (orderBean.getExtInfo() != null && !(OrderSourceV1.SAAS.getCode().equals(orderBean.getSource()) || OrderSourceV1.ALIPAY.getCode().equals(orderBean.getSource()))) {
-            return;
-        }
-        MessageTemplateRequest<MessagePushOrderTemplateRequest> messageTemplateRequest = null;
-        try {
-            messageTemplateRequest = messagePushAdapter.convent2MessageTemplateRequest(orderBean, reason, opType);
-            if (messageTemplateRequest != null && messageTemplateRequest.getMessageEventType() != null) {
-                BaseResponse baseResponse = messageTemplatePushService.sendTemplateMsg(messageTemplateRequest);
-                if (baseResponse != null && !ResponseResultEnum.SUCCESS.getCode().equals(baseResponse.getCode())) {
-                    ApiLog.printLog("sendTemplateMsg", orderBean.getOid(), JSONObject.toJSONString(baseResponse), null);
-                }
-            }
-        } catch (Exception e) {
-            ErrorLog.printErrorLog("sendTemplateMsgError", "", messageTemplateRequest, e);
-        }
-
-
+        //if (orderBean.getExtInfo() != null && !(OrderSourceV1.SAAS.getCode().equals(orderBean.getSource()) || OrderSourceV1.ALIPAY.getCode().equals(orderBean.getSource()))) {
+        //    return;
+        //}
+        //MessageTemplateRequest<MessagePushOrderTemplateRequest> messageTemplateRequest = null;
+        //try {
+        //    messageTemplateRequest = messagePushAdapter.convent2MessageTemplateRequest(orderBean, reason, opType);
+        //    if (messageTemplateRequest != null && messageTemplateRequest.getMessageEventType() != null) {
+        //        BaseResponse baseResponse = messageTemplatePushService.sendTemplateMsg(messageTemplateRequest);
+        //        if (baseResponse != null && !ResponseResultEnum.SUCCESS.getCode().equals(baseResponse.getCode())) {
+        //            ApiLog.printLog("sendTemplateMsg", orderBean.getOid(), JSONObject.toJSONString(baseResponse), null);
+        //        }
+        //    }
+        //} catch (Exception e) {
+        //    ErrorLog.printErrorLog("sendTemplateMsgError", "", messageTemplateRequest, e);
+        //}
     }
 
     /**