Merge branch '20201125-coco-zhw' of gitlab.freemud.com:order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/dto/ecology/SubscribeMessageRequest.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -195,6 +195,7 @@ public class QueryOrdersResponse {
              * 支付凭证 非码流水ID
              */
             private String payVoucher;
+
             /**
              * 手机号
              */

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

@@ -5,8 +5,12 @@ import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.TakeMealNoticesVO;
 import cn.freemud.service.CallerService;
 import cn.freemud.utils.ResponseUtil;
+import com.freemud.application.sdk.api.log.ApiAnnotation;
+import com.freemud.application.sdk.api.log.LogParams;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -14,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 叫号器
  */
 @Slf4j
-@RequestMapping("/caller")
+@RequestMapping("order/caller")
 @RestController
 @Validated
 public class CallerController {
@@ -29,7 +33,9 @@ private CallerService callerService;
      * 取餐通知
      * @return
      */
-    public BaseResponse takeMealNotices(TakeMealNoticesVO vo){
+    @PostMapping("/takeMealNotices")
+    @ApiAnnotation(logMessage = "takeMealNotices")
+    public BaseResponse takeMealNotices(@Validated @LogParams @RequestBody TakeMealNoticesVO vo){
         return  callerService.takeMealNotices(vo);
     }
 

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

@@ -10,27 +10,49 @@ import java.util.List;
 public class SubscribeMessageRequest {
 
 
+    /**
+     * 预约单下单成功通知
+     */
     private BookingOrderPayedScene bookingOrderPayedScene;
 
+    /**
+     * 预约单取单提醒
+     */
     private BookingOrderPayedScene bookingOrderTakeReminderScene;
 
     /**
      * 渠道
+     * 1 微信小程序
+     * 2 支付宝小程序
+     * 3 手机app
+     * 4 线下应用
+     * 5 字节小程序
+     * 6 h5
      */
     private Integer channel;
+
     /**
-     *
+     * 配送异常提醒
      */
-    private String scene;
-
     private  DeliveryErrorReminder  deliveryErrorReminder;
 
+    /**拼单提醒
+     *
+     */
     private GroupBuyingStatusReminder groupBuyingStatusReminder;
 
+    /**
+     * 即时单下单成功通知
+     */
     private InstantOrderPayedScene instantOrderPayedScene;
-
+    /**
+     * 即时单取餐通知
+     */
     private InstantOrderPayedScene instantOrderTakeReminderScene;
 
+    /**
+     *
+     */
     private  String messageEventType;
 
     /**
@@ -43,10 +65,23 @@ public class SubscribeMessageRequest {
      */
     private List<String> openIdList;
 
+    /**
+     *自配送配送通知
+     */
     private OrderDeliveryScene orderDeliveryScene;
-
+    /**
+     *
+     */
     private SceneCouponRequest sceneCouponExpiredRequest;
 
+    /**
+     * //即时单scene_instant
+     * //预约单:scene_appoint
+     * //自配送单:scene_self_delivery
+     * //拼单提醒:scene_group_buying
+     */
+    private String scene;
+
     private SceneCouponRequest sceneCouponReceiveRequest;
 
     private SceneInviteGiftRequest sceneInviteGiftRequest;

order-application-service/src/main/java/cn/freemud/entities/vo/TakeMealNoticesVO.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @author freemud
  */
@@ -25,5 +27,5 @@ public class TakeMealNoticesVO {
     private Integer cupTotalNum;
 
     @ApiModelProperty(value = "订单")
-    private String[] orders;
+    private List<String> orderList;
 }

order-application-service/src/main/java/cn/freemud/enums/MessageEventTypeEnum.java

+package cn.freemud.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum  MessageEventTypeEnum {
+
+    INSTANT_ORDER_PAYED(30, "INSTANT_ORDER_PAYED", "即时单下单成功通知"),
+    BOOKING_ORDER_PAYED(31, "BOOKING_ORDER_PAYED", "预约单下单成功通知"),
+    SELF_DELIVERY_ORDER_PAYED(32, "SELF_DELIVERY_ORDER_PAYED", "自配送下单成功通知"),
+    ORDER_DELIVERY(33, "ORDER_DELIVERY", "订单配送通知"),
+    BOOKING_ORDER_TAKE_REMINDER(34, "BOOKING_ORDER_TAKE_REMINDER", "预约单取单通知"),
+    INSTANT_ORDER_TAKE_REMINDER(35, "INSTANT_ORDER_TAKE_REMINDER", "即时单取单通知"),
+    GROUP_BUYING_STATUS_REMINDER(36, "GROUP_BUYING_STATUS_REMINDER", "拼单提醒"),
+    DELIVERY_ERROR_REMINDER(37, "DELIVERY_ERROR_REMINDER", "配送异常提醒"),
+            ;
+
+
+
+    private int code;
+    private String type;
+    private String name;
+
+    MessageEventTypeEnum(int code, String type,String name) {
+        this.code = code;
+        this.type = type;
+        this.name = name;
+    }
+
+}

order-application-service/src/main/java/cn/freemud/service/CallerService.java

 package cn.freemud.service;
 
+import cn.freemud.amp.body.OrderBody;
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.base.log.LogTreadLocal;
+import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.RedisKeyConstant;
+import cn.freemud.constant.ResponseCodeConstant;
+import cn.freemud.entities.dto.GetMemberInfoByIdRequestDto;
+import cn.freemud.entities.dto.GetMemberInfoByIdResponseDto;
+import cn.freemud.entities.dto.ecology.BookingOrderPayedScene;
+import cn.freemud.entities.dto.ecology.InstantOrderPayedScene;
+import cn.freemud.entities.dto.ecology.SubscribeMessageRequest;
+import cn.freemud.entities.dto.ecology.SubscribeMessageResponse;
 import cn.freemud.entities.vo.TakeMealNoticesVO;
+import cn.freemud.enums.MessageEventTypeEnum;
+import cn.freemud.service.impl.CheckOrder;
+import cn.freemud.service.thirdparty.CustomerClient;
+import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
+import cn.freemud.utils.DateTimeUtil;
 import cn.freemud.utils.ResponseUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
+import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
+import com.freemud.sdk.api.assortment.order.enums.NewOrderType;
+import com.freemud.sdk.api.assortment.order.request.order.BaseQueryOrderRequest;
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
+import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
+@AllArgsConstructor
 @Service
+@Slf4j
 public class CallerService {
 
-    @Autowired
-    private RedisTemplate redisTemplate;
+    private final RedisTemplate redisTemplate;
+    private final EcologyAdminApplicationClient ecologyAdminApplicationClient;
+    private final OrderCenterSdkService orderCenterSdkService;
+    private final CheckOrder checkOrder;
+
 
     /**
      * 缓存 待制作杯数量
+     *
      * @param vo
      */
-    private void  cacheTakeMealNotices(TakeMealNoticesVO vo){
+    private void cacheTakeMealNotices(TakeMealNoticesVO vo) {
         String redisKey = RedisKeyConstant.notMadeGoodsNumber(vo.getPartnerId(), vo.getStoreCode());
-        redisTemplate.boundValueOps(redisKey).set(vo.getCupTotalNum(),1, TimeUnit.DAYS);
+        redisTemplate.boundValueOps(redisKey).set(vo.getCupTotalNum(), 1, TimeUnit.DAYS);
+    }
+
+    /**
+     * pos -> 推送模板消息
+     * 即时单
+     * 预约单
+     *
+     * @param vo
+     * @return
+     */
+    public BaseResponse takeMealNotices(TakeMealNoticesVO vo) {
+         cacheTakeMealNotices(vo);
+        if (Objects.isNull(vo.getOrderList())) {
+            return ResponseUtil.success();
+        }
+        vo.getOrderList().stream().forEach(orderId -> {
+            BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
+            baseQueryOrderRequest.setOrderId(orderId);
+            baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
+            QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
+            QueryOrdersResponse.DataBean.OrderBean orderBean = queryOrderByIdResponse.getData();
+            if (Objects.isNull(orderBean)) {
+                return;
+            }
+            OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {
+            });
+            if (Objects.isNull(extInfoDto.getOpenid())) {
+                log.error("订单号:{},没有openId", orderId);
+                return;
+            }
+            StoreResponse storeResponse = checkOrder.getStoreInfo(orderBean.getCompanyId(), orderBean.getShopId(), LogTreadLocal.getTrackingNo());
+            if (storeResponse.getBizVO() == null) {
+                log.error("订单号:{},商户号:{},没有门店信息", orderId, orderBean.getShopId());
+                return;
+            }
+            List<Integer> takeawayOrderType = Lists.newArrayList(
+                    NewOrderType.RESERVED_EXPRESS.getCode(),
+                    NewOrderType.GENERAL_EXPRESS.getCode());
+            if (takeawayOrderType.contains(orderBean.getNewOrderType())) {
+                // 外卖单不发模板消息
+                    return;
+            }
+            orderBean.setShopAddress(storeResponse.getBizVO().getAddress());
+            SubscribeMessageRequest subscribeMessageRequest = new SubscribeMessageRequest();
+            subscribeMessageRequest.setMiniAppId(extInfoDto.getAppid());
+            subscribeMessageRequest.setOpenIdList(Lists.newArrayList(extInfoDto.getOpenid()));
+            //  coco  order_client  2微信小程序 3支付宝小程序 需要转换生态的
+            subscribeMessageRequest.setChannel(orderBean.getOrderClient().equals("2") ? 1 : 2);
+            boolean reservationOrder = isReservationOrder(orderBean);
+            if (reservationOrder) {
+                //预约单
+                BookingOrderPayedScene scene = new BookingOrderPayedScene();
+                scene.setMerchantAddress(orderBean.getShopAddress());
+                scene.setMerchantName(orderBean.getShopName());
+                scene.setOrderNo(orderId);
+                scene.setOrderType(orderBean.getNewOrderType().toString());
+                scene.setTakeOrderTime(DateTimeUtil.getCurrentTimeStr());
+                subscribeMessageRequest.setBookingOrderTakeReminderScene(scene);
+                subscribeMessageRequest.setScene("scene_appoint");
+                subscribeMessageRequest.setMessageEventType(MessageEventTypeEnum.BOOKING_ORDER_TAKE_REMINDER.getType());
+            } else {
+                InstantOrderPayedScene scene = new InstantOrderPayedScene();
+                scene.setFriendlyTips("饮品已制作完成，请凭取单号及时到店取单哟！");
+                scene.setOrderType(orderBean.getNewOrderType().toString());
+                scene.setMerchantAddress(orderBean.getShopAddress());
+                scene.setMerchantName(orderBean.getShopName());
+                scene.setOrderNo(orderId);
+                subscribeMessageRequest.setInstantOrderTakeReminderScene(scene);
+                subscribeMessageRequest.setScene("scene_instant");
+                subscribeMessageRequest.setMessageEventType(MessageEventTypeEnum.INSTANT_ORDER_TAKE_REMINDER.getType());
+            }
+            //发送模板消息
+            SubscribeMessageResponse subscribeMessageResponse = ecologyAdminApplicationClient.subscribeMessage(subscribeMessageRequest);
+            if (!ResponseCodeConstant.RESPONSE_SUCCESS.equals(subscribeMessageResponse.getCode())) {
+                log.error("ecologyAdminApplicationClient.subscribeMessage调用失败 ,request:{},body:{}", JSON.toJSONString(subscribeMessageResponse),
+                        JSON.toJSONString(subscribeMessageRequest));
+            }
+        });
+
+        return ResponseUtil.success();
     }
 
-    public BaseResponse takeMealNotices(TakeMealNoticesVO vo){
-        cacheTakeMealNotices(vo);
-        //发送取餐通知消息 cc 生态
-        return  ResponseUtil.success();
+    /**
+     * 是否预约单
+     * true 预约单
+     *
+     * @return
+     */
+    private boolean isReservationOrder(QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        if (Objects.nonNull(orderBean.getGmtExpect())) {
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+
     }
 
 }

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

@@ -30,6 +30,14 @@ import cn.freemud.entities.dto.PayAccessResponse;
 import cn.freemud.entities.dto.QueryOrdersResponseDto.DataBean.OrderBean;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
 import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
+import cn.freemud.entities.dto.delivery.OrderRemindRequestDto;
+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.ecology.BookingOrderPayedScene;
+import cn.freemud.entities.dto.ecology.InstantOrderPayedScene;
+import cn.freemud.entities.dto.ecology.SubscribeMessageRequest;
+import cn.freemud.entities.dto.ecology.SubscribeMessageResponse;
 import cn.freemud.entities.dto.delivery.*;
 import cn.freemud.entities.dto.order.CreateOrderOperateDto;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
@@ -56,6 +64,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.manager.*;
@@ -286,6 +295,8 @@ public class OrderServiceImpl implements Orderservice {
     private ComPayClient comPayClient;
     @Autowired
     private AssortmentOpenPlatformIappWxappStoreManager assortmentOpenPlatformIappWxappStoreManager;
+    @Autowired
+    private  EcologyAdminApplicationClient ecologyAdminApplicationClient;
 
     @Autowired
     private SvcComPayClient svcComPayClient;
@@ -1775,6 +1786,18 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "不能操作非本人的订单");
         }
         OrderBean orderBean = orderByIdResponseDto.getData();
+
+        if (PayStatus.NOT_PAY.getCode().equals(orderByIdResponseDto.getData().getPayStatus())
+                || OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
+            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单未支付，无法退款");
+        }
+        if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) {
+            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单已取消，无法退款");
+        }
+        if (OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
+            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单配送中，退款请联系售后！");
+        }
+
         // todo coco 商户校验
         if (partnerId.equals(orderByIdResponseDto.getData().getCompanyId())) {
             // COCO 即时单不可取消
@@ -1802,16 +1825,6 @@ public class OrderServiceImpl implements Orderservice {
                 return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR_ESTIMATE_TIME);
             }
         }
-        if (PayStatus.NOT_PAY.getCode().equals(orderByIdResponseDto.getData().getPayStatus())
-                || OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
-            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单未支付，无法退款");
-        }
-        if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) {
-            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单已取消，无法退款");
-        }
-        if (OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
-            return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单配送中，退款请联系售后！");
-        }
 
         /**
          * 已接单，制作完成，配送中,未接单，用户可申请退款
@@ -2223,13 +2236,13 @@ public class OrderServiceImpl implements Orderservice {
      */
     private void sendMessage(QueryOrdersResponseDto.DataBean.OrderBean orderBean, MessageEventType messageEventType) {
         MessageTemplateRequest<MessagePushOrderTemplateRequest> messageTemplateRequest = null;
-        try {
-            messageTemplateRequest = messageNoticeAdapter.convent2MessageTemplateRequest(orderBean);
-            messageTemplateRequest.setMessageEventType(messageEventType);
-            this.messageTemplatePushService.sendTemplateMsg(messageTemplateRequest);
-        } catch (Exception e) {
-            LogUtil.error("sendTemplateMsg_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(messageTemplateRequest), e);
-        }
+            try {
+                messageTemplateRequest = messageNoticeAdapter.convent2MessageTemplateRequest(orderBean);
+                messageTemplateRequest.setMessageEventType(messageEventType);
+                this.messageTemplatePushService.sendTemplateMsg(messageTemplateRequest);
+            } catch (Exception e) {
+                LogUtil.error("sendTemplateMsg_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(messageTemplateRequest), e);
+            }
     }
 
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/EcologyAdminApplicationClient.java

@@ -30,7 +30,7 @@ public interface EcologyAdminApplicationClient {
     @PostMapping(value = "/ecology/api/getAuthorizerAccessToken")
     GetTokenResponseDto getAuthorizerAccessToken(@RequestBody GetAuthorizerRequestDto request);
 
+
     @PostMapping(value = "/ecology/api/subscribeMessage/send")
     SubscribeMessageResponse subscribeMessage(SubscribeMessageRequest request);
-
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

@@ -277,6 +277,8 @@ public class OrderInfoReqs {
      */
     private List<OrderPayItemReqs> orderPayItemCreateReqList;
 
+    private String appId;
+
     List<OrderSendCouponResp> orderSendCouponRespList;
 
 }