coco支付有礼活动

order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseDto.java

@@ -22,6 +22,17 @@ import java.util.List;
 public class PayGiftCheckAndJoinResponseDto {
 
     private  String activityName;
+    /**
+     * 发送方式
+     * 0-静默发送
+     * 5-手动发送
+     */
+    private  Integer sendType;
+
+    /**
+     * 活动类型
+     */
+    private  String type;
     private List<PayGiftCouponVo> coupons;
     private PayGiftWechatCouponInfoVo wechatCouponInfo;
 }

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

@@ -351,6 +351,13 @@ public class QueryOrderResponseVo {
     //支付有礼活动名称
     private String activityName;
 
+    /**
+     * 支付有礼发送方式
+     * 0-静默发送
+     * 5-手动发送
+     */
+    private Integer activitySendType;
+
     //支付有礼领券集合
     private List<PayGiftCouponVo> coupons;
     private PayGiftWechatCouponInfoVo wechatCouponInfo;

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

@@ -176,6 +176,11 @@ public class OrderServiceImpl implements Orderservice {
     @Value("${mq.cloud_print_exchange}")
     private String cloud_print_exchange;
 
+    /**
+     * coco商户
+     */
+    @Value("#{'${coco.partnerId}'.split(',')}")
+    private List<String> cocoPartnerId;
 
     @Autowired
     private AssortmentCloudPrinterManager cloudPrinterManager;
@@ -865,14 +870,32 @@ public class OrderServiceImpl implements Orderservice {
                     // 取红包图片
                     queryOrderResponseVo.setRedpacketsPicture(getRedpacketsPicture(activityId));
                     queryOrderResponseVo.setActivityId(activityId);
+
+                    // coco订单不考略是否查询待取餐的订单，直接调用支付有礼活动
+                    // 所以在这个地方排除掉coco，在下边单独实现
                     //参与支付有礼活动
-                    joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo);
+                    if(!cocoPartnerId.contains(queryOrderVo.getPartnerId())){
+                        joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo);
+                    }
+
                 } catch (Exception e) {
                     LogUtil.error("queryOrders_activity_error", gson.toJson(queryOrdersDto), gson.toJson(queryOrderResponseVo), e);
                 }
             });
         }
 
+        // coco订单参与支付有礼活动
+        if(cocoPartnerId.contains(queryOrderVo.getPartnerId())){
+            queryOrderResponseVos.forEach(queryOrderResponseVo -> {
+                try {
+                    joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo);
+
+                } catch (Exception e) {
+                    LogUtil.error("coco_queryOrders_activity_error", gson.toJson(queryOrdersDto), gson.toJson(queryOrderResponseVo), e);
+                }
+            });
+        }
+
         responseMap.put("count", queryOrderResponse.getData() == null ? 0 : queryOrderResponse.getData().getCount());
         responseMap.put("list", queryOrderResponseVos);
         //只有有订单时才显示用户自定义取餐信息
@@ -1125,6 +1148,7 @@ public class OrderServiceImpl implements Orderservice {
             queryOrderResponseVo.setActivityName(payGiftResponse.getActivityName());
             queryOrderResponseVo.setCoupons(payGiftResponse.getCoupons());
             queryOrderResponseVo.setWechatCouponInfo(payGiftResponse.getWechatCouponInfo());
+            queryOrderResponseVo.setActivitySendType(payGiftResponse.getSendType());
         }
     }
 
@@ -1272,6 +1296,12 @@ public class OrderServiceImpl implements Orderservice {
             queryOrderResponseVo.setRedpacketsPicture(getRedpacketsPicture(activityId));
         }
 
+        // 支付有礼
+        // 目前只有coco在订单详情参加支付有礼，且不检查订单的状态
+        if(cocoPartnerId.contains(partnerId)){
+            joinPayGift(sessionId, queryOrderResponseVo);
+        }
+
         return ResponseUtil.success(queryOrderResponseVo);
     }