华莱士

order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java

@@ -58,7 +58,7 @@ public class SpellGroupOrderAdapter {
         createOrderRequest.setStoreNameEn(storeInfo.getStoreNameEn());
         createOrderRequest.setUserId(createSpellGroupOrderDto.getUserId());
         createOrderRequest.setUserName(createSpellGroupOrderDto.getNickName());
-        createOrderRequest.setOrderType(OrderType.SPELL_GROUP.getCode());
+        createOrderRequest.setOrderType(OrderType.MALL.getCode());
         createOrderRequest.setPayType(PayType.ONLINE_PAY.getCode());
         PayChannelType payChannelType = PayChannelType.getByIndex(createSpellGroupOrderDto.getPayChannelType());
         if (payChannelType != null) {
@@ -67,7 +67,7 @@ public class SpellGroupOrderAdapter {
             createOrderRequest.setPayChannelType(payChannelType.getIndex());
         }
         //运费
-        long freight = 1000 ;
+        long freight = 0 ;
         //判断是否包邮，包邮的话运费为0 todo
         if (!createSpellGroupOrderDto.getDeliveryTemplateInfoVo().getIsDispatchFree() == true) {
             freight = createSpellGroupOrderDto.getDeliveryTemplateInfoVo().getFreight();

order-application-service/src/main/java/cn/freemud/entities/dto/promotion/QuerySpellGroupVo.java

@@ -45,22 +45,42 @@ public class QuerySpellGroupVo {
      */
     @Data
     public static class Group {
-        /**
-         * 团状态：0-组团中，1-已成团，2-成团失败
-         */
-        private Integer groupStatus;
-        /**
-         * 拼团结束时间：2021-04-21 23:59:59
-         */
-        private String endTime;
-        /**
-         * 差多少人成团
-         */
-        private Integer lessPeople;
-        /**
-         * 活动开始时间如：2021-04-15 00:00:00
-         */
-        private String startTime;
+            /**
+             * 团号
+             */
+            private String groupId;
+            /**
+             * 活动号
+             */
+            private String activeId;
+            /**
+             * 团状态：0-组团中，1-已成团，2-成团失败
+             */
+            private Integer groupStatus;
+            /**
+             * 开团开始时间
+             */
+            private String startTime;
+            /**
+             * 开团结束时间
+             */
+            private String endTime;
+            /**
+             * 差多少人成团
+             */
+            private Integer lessPeople;
+            /**
+             * 已参团人数
+             */
+            private Integer count;
+            /**
+             * 成团时间
+             */
+            private String groupTime;
+            /**
+             * 剩余时间戳毫秒
+             */
+            private Long time;
     }
 
     /**

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

@@ -54,7 +54,7 @@ public class CreateSpellGroupOrderReq {
      * 订单类型  1 到店自取 2 外卖   枚举CreateOrderType
      */
     @Builder.Default
-    private Integer orderType = 6;
+    private Integer orderType = 3;
 
     @Builder.Default
     @ApiModelProperty(value = "订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单")