退款模板消息迁移

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/CallbackUrlRequestDto.java

@@ -84,4 +84,6 @@ public class CallbackUrlRequestDto {
      * 异常信息
      */
     private String errorDesc;
+
+    private String errorCreateTime;
 }

order-application-service/src/main/java/cn/freemud/entities/dto/ecology/SendMessageRequest.java

@@ -48,4 +48,13 @@ public class SendMessageRequest {
      */
     private String utcTime;
 
+    private String amount;
+
+    private String orderTime;
+
+    private String phone;
+
+    private String UserName;
+
+    private String remindMessage;
 }

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -330,8 +330,10 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
 
     @Override
     public BaseResponse errorCallbackUrl(CallbackUrlRequestDto request) {
-        // 获取回调状态
+        // pos获取回调状态
         sendPosMessage(request.getPartnerId(), request.getStoreId(), request.getOrderId(), 71, request.getErrorDesc());
+        //生态回调
+        sendException(request.getOrderId(),  request.getErrorDesc(),  request.getErrorCreateTime(),  "运单预警");
         return ResponseUtil.success();
     }
 

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

@@ -35,6 +35,9 @@ import cn.freemud.entities.dto.delivery.QueryDeliveryAmountResponseDto;
 import cn.freemud.entities.dto.delivery.QueryLocusRiderTrackDto;
 import cn.freemud.entities.dto.delivery.ResRiderTrackDto;
 import cn.freemud.entities.dto.delivery.*;
+import cn.freemud.entities.dto.ecology.SendMessageRequest;
+import cn.freemud.entities.dto.ecology.SendMessageResponse;
+import cn.freemud.entities.dto.ecology.SubscribeMessageRequest;
 import cn.freemud.entities.dto.order.CreateOrderOperateDto;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
 import cn.freemud.entities.dto.order.FacePayRequestDto;
@@ -77,6 +80,7 @@ import cn.freemud.utils.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.freemud.api.assortment.datamanager.entity.db.*;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
@@ -3416,11 +3420,57 @@ public class OrderServiceImpl implements Orderservice {
      */
     public void sendApplyRefundSubscriptionNotice(OrderBean orderBean, OrderRefundVo request) {
         LogUtil.debug("sendApplyRefundSubscriptionNotice", JSONObject.toJSONString(request), null);
-        String partnerId = orderBean.getCompanyId();
-        String shopId = orderBean.getShopId();
-        if (orderBean.getExtInfo() == null) {
-            return;
-        }
+//        String partnerId = orderBean.getCompanyId();
+//        String shopId = orderBean.getShopId();
+//        if (orderBean.getExtInfo() == null) {
+//            return;
+//        }
+//        OrderExtInfoDto extInfo = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);
+//        if (extInfo == null || extInfo.getAppid() == null) {
+//            return;
+//        }
+//        AssortmentOpenPlatformWxappAuthorizer authorizerAppid = wxappAuthorizerManager.findAuthorizerByWxAppId(extInfo.getAppid());
+//        if (authorizerAppid == null) {
+//            return;
+//        }
+//        String accessToken = authorizerAppid.getAuthorizerAccessToken();
+////        String orderId = orderBean.getOid();
+//        MpTemplateMsg template = new MpTemplateMsg();
+//        MpTemplateMsg.TemplateMsgData data = new MpTemplateMsg.TemplateMsgData();
+//        MpTemplateMsgDataValue first = new MpTemplateMsgDataValue();
+//        first.setValue("用户申请退款");
+//        MpTemplateMsgDataValue keyword1 = new MpTemplateMsgDataValue();
+//        keyword1.setValue(orderId);
+//        MpTemplateMsgDataValue keyword2 = new MpTemplateMsgDataValue();
+////        Double amount = orderBean.getAmount() / 100.0D;
+//        keyword2.setValue(amount.toString() + " 元");
+//        MpTemplateMsgDataValue keyword3 = new MpTemplateMsgDataValue();
+//        keyword3.setValue(orderBean.getGmtPay() == null ? "" : DateUtil.convert2String(new Date(orderBean.getGmtPay()), "yyyy-MM-dd HH:mm:ss"));
+//        MpTemplateMsgDataValue keyword4 = new MpTemplateMsgDataValue();
+//        keyword4.setValue(orderBean.getUserName());
+//        MpTemplateMsgDataValue keyword5 = new MpTemplateMsgDataValue();
+//        keyword5.setValue(orderBean.getPhone());
+//        MpTemplateMsgDataValue remark = new MpTemplateMsgDataValue();
+//        remark.setValue(request.getReason() + "," + request.getRemarks());
+//        data.setFirst(first);
+//        data.setKeyword1(keyword1);
+//        data.setKeyword2(keyword2);
+//        data.setKeyword3(keyword3);
+//        data.setKeyword4(keyword4);
+//        data.setKeyword5(keyword5);
+//        data.setRemark(remark);
+//        template.setData(data);
+//        MessagePushNewMqBody messagePushMqBody = new MessagePushNewMqBody();
+//        messagePushMqBody.setPartnerId(partnerId);
+//        messagePushMqBody.setAccessToken(accessToken);
+//        messagePushMqBody.setTemplate(template);
+//        messagePushMqBody.setStoreId(shopId);
+//        messagePushMqBody.setOrderId(orderId);
+//        messagePushMqBody.setWxappid(extInfo.getAppid());
+//        Header header = new Header(MQAction.INSERT.getAction(), "order-application-service-api", orderId, MessageOfficialRefundPushMqConfig.MESSAGE_PUSH_ORDER_REFUND_QUEUE);
+//        MQMessage<MessagePushNewMqBody> message = new MQMessage<>(header, messagePushMqBody);
+//        mqService.convertAndSend(MessageOfficialRefundPushMqConfig.MESSAGE_PUSH_EXCHANGE_TOPIC, MessageOfficialRefundPushMqConfig.MESSAGE_PUSH_ORDER_REFUND_QUEUE_EKY, message);
+        try {
             OrderExtInfoDto extInfo = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);
             if (extInfo == null || extInfo.getAppid() == null) {
                 return;
@@ -3429,43 +3479,23 @@ public class OrderServiceImpl implements Orderservice {
             if (authorizerAppid == null) {
                 return;
             }
-        String accessToken = authorizerAppid.getAuthorizerAccessToken();
             String orderId = orderBean.getOid();
-        MpTemplateMsg template = new MpTemplateMsg();
-        MpTemplateMsg.TemplateMsgData data = new MpTemplateMsg.TemplateMsgData();
-        MpTemplateMsgDataValue first = new MpTemplateMsgDataValue();
-        first.setValue("用户申请退款");
-        MpTemplateMsgDataValue keyword1 = new MpTemplateMsgDataValue();
-        keyword1.setValue(orderId);
-        MpTemplateMsgDataValue keyword2 = new MpTemplateMsgDataValue();
             Double amount = orderBean.getAmount() / 100.0D;
-        keyword2.setValue(amount.toString() + " 元");
-        MpTemplateMsgDataValue keyword3 = new MpTemplateMsgDataValue();
-        keyword3.setValue(orderBean.getGmtPay() == null ? "" : DateUtil.convert2String(new Date(orderBean.getGmtPay()), "yyyy-MM-dd HH:mm:ss"));
-        MpTemplateMsgDataValue keyword4 = new MpTemplateMsgDataValue();
-        keyword4.setValue(orderBean.getUserName());
-        MpTemplateMsgDataValue keyword5 = new MpTemplateMsgDataValue();
-        keyword5.setValue(orderBean.getPhone());
-        MpTemplateMsgDataValue remark = new MpTemplateMsgDataValue();
-        remark.setValue(request.getReason() + "," + request.getRemarks());
-        data.setFirst(first);
-        data.setKeyword1(keyword1);
-        data.setKeyword2(keyword2);
-        data.setKeyword3(keyword3);
-        data.setKeyword4(keyword4);
-        data.setKeyword5(keyword5);
-        data.setRemark(remark);
-        template.setData(data);
-        MessagePushNewMqBody messagePushMqBody = new MessagePushNewMqBody();
-        messagePushMqBody.setPartnerId(partnerId);
-        messagePushMqBody.setAccessToken(accessToken);
-        messagePushMqBody.setTemplate(template);
-        messagePushMqBody.setStoreId(shopId);
-        messagePushMqBody.setOrderId(orderId);
-        messagePushMqBody.setWxappid(extInfo.getAppid());
-        Header header = new Header(MQAction.INSERT.getAction(), "order-application-service-api", orderId, MessageOfficialRefundPushMqConfig.MESSAGE_PUSH_ORDER_REFUND_QUEUE);
-        MQMessage<MessagePushNewMqBody> message = new MQMessage<>(header, messagePushMqBody);
-        mqService.convertAndSend(MessageOfficialRefundPushMqConfig.MESSAGE_PUSH_EXCHANGE_TOPIC, MessageOfficialRefundPushMqConfig.MESSAGE_PUSH_ORDER_REFUND_QUEUE_EKY, message);
+            SendMessageRequest sendMessageRequest = new SendMessageRequest();
+            sendMessageRequest.setMessageType("REFUND_ORDER");
+            sendMessageRequest.setOrderId(orderId);
+            sendMessageRequest.setPartnerId(orderBean.getCompanyId());
+            sendMessageRequest.setRemark(request.getReason() + "," + request.getRemarks());
+            sendMessageRequest.setStoreId(orderBean.getShopId());
+            sendMessageRequest.setAmount(amount.toString());
+            sendMessageRequest.setRemindMessage("用户申请退款");
+            sendMessageRequest.setOrderTime(orderBean.getGmtPay() == null ? "" : DateUtil.convert2String(new Date(orderBean.getGmtPay()), "yyyy-MM-dd HH:mm:ss"));
+            sendMessageRequest.setUserName(orderBean.getUserName());
+            sendMessageRequest.setPhone(orderBean.getPhone());
+            ecologyAdminApplicationClient.sendTemplateMessage(sendMessageRequest);
+        } catch (Exception e) {
+            LogUtil.error("sendApplyRefundSubscriptionNotice_error", null, null, e);
+        }
     }
 
     /**