华莱士

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

@@ -1446,6 +1446,11 @@ public class OrderAdapter {
             responseVo.setQueueIndex(ordersBean.getQueueIndex());
             responseVo.setOrderProgressBarStatus(ordersBean.getOrderProgressBarStatus());
             responseVo.setPayTurnoffRefund(getPayTurnoffRefund());
+
+            //拼团信息
+            responseVo.setSpellGroupCode(ordersBean.getSpellGroupCode());
+
+
             list.add(responseVo);
         });
         return list;

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

+package cn.freemud.entities.dto.promotion;
+
+import lombok.Data;
+
+/**
+ * @author freemud
+ * @title: QuerySpellGroupVo
+ * @projectName order-group
+ * @description: TODO
+ * @date 2021/4/21下午5:19
+ */
+@Data
+public class QuerySpellGroupVo {
+
+    /**
+     * 当前用户是否已参与：0-否，1-是
+     */
+    private String isJoin;
+    /**
+     * 当前用户订单
+     */
+    private String orderId;
+
+    /**
+     * 团信息
+     */
+    @Data
+    public static class group {
+        /**
+         * 团状态：0-组团中，1-已成团，2-成团失败
+         */
+        private String groupStatus;
+        /**
+         * 拼团结束时间：2021-04-21 23:59:59
+         */
+        private String endTime;
+        /**
+         * 差多少人成团
+         */
+        private String lessPeople;
+        /**
+         * 活动开始时间如：2021-04-15 00:00:00
+         */
+        private String startTime;
+    }
+
+    /**
+     * 商品信息
+     */
+    @Data
+    public static class good {
+        /**
+         * 商品id
+         */
+        private String goodId;
+        /**
+         * 商品名称
+         */
+        private String goodName;
+        /**
+         * 拼团价，单位分
+         */
+        private String price;
+        /**
+         * 商品原价，单位分
+         */
+        private String originPrice;
+    }
+
+    @Data
+    public static class groupInfo {
+        /**
+         * 是否团长：0不是，1-是
+         */
+        private Integer sponsor;
+        /**
+         * 团号
+         */
+        private String groupId;
+        /**
+         * 用户昵称
+         */
+        private String userName;
+        /**
+         * 头像
+         */
+        private String headUrl;
+        /**
+         * 订单号
+         */
+        private String orderId;
+    }
+
+}

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

+package cn.freemud.entities.dto.promotion;
+
+import lombok.Data;
+
+/**
+ * @author freemud
+ * @title: QuerySpellGroupVo
+ * @projectName order-group
+ * @description: TODO
+ * @date 2021/4/21下午5:15
+ */
+@Data
+public class QuerySpellGroupVoResponse<T> {
+
+    private String code;
+    private String message;
+    private QuerySpellGroupVo result;
+
+
+}

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

@@ -14,6 +14,7 @@ package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.PromotionMessageDto;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
+import cn.freemud.entities.dto.promotion.QuerySpellGroupVo;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Builder;
@@ -471,6 +472,16 @@ public class QueryOrderResponseVo {
      */
     private Long orderUserNum;
 
+    /**
+     * 团号查询拼团信息
+     */
+    private QuerySpellGroupVo spellGroup;
+
+    /**
+     *  拼团团号,此处用于接收转换信息
+     */
+    private String spellGroupCode;
+
     @Data
     public static class OrderStatusFlow {
         /**

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+/**
+ * @author freemud
+ * @title: QuerySpellGroupRequet
+ * @projectName order-group
+ * @description: TODO
+ * @date 2021/4/21下午5:38
+ */
+@Data
+public class QuerySpellGroupRequest {
+
+    /**
+     * 商户号
+     */
+    private String partnerId;
+    /**
+     * sessionId
+     */
+    private String sessionId;
+    /**
+     * 活动号
+     */
+    private String activityCode;
+    /**
+     * 团号
+     */
+    private String groupId;
+
+}

order-application-service/src/main/java/cn/freemud/manager/SpellGroupOrderDataManager.java

@@ -5,6 +5,7 @@ import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateRequest;
 import cn.freemud.entities.dto.delivery.QueryDeliveryTemplateResponse;
 import cn.freemud.entities.dto.product.ProductInfo;
 import cn.freemud.entities.dto.promotion.*;
+import cn.freemud.entities.vo.QuerySpellGroupRequest;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.service.thirdparty.DeliveryFeiginClient;
 import cn.freemud.service.thirdparty.PromotionDiscountClient;
@@ -154,7 +155,6 @@ public class SpellGroupOrderDataManager {
         return queryDeliveryTemplateResponse;
     }
 
-
     public GroupWorkJoinResponse groupWorkJoin(QueryOrdersResponseDto.DataBean.OrderBean orderBean,String sessionId){
         AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
         GroupWorkJoinRequest groupWorkJoinRequest = new GroupWorkJoinRequest();
@@ -174,6 +174,19 @@ public class SpellGroupOrderDataManager {
         return groupWorkJoinResponse;
     }
 
+    public QuerySpellGroupVo queryByGroupId(String groupId, String sessionId, String activityCode, String partnerId){
+        QuerySpellGroupRequest querySpellGroupRequest = new QuerySpellGroupRequest();
+        querySpellGroupRequest.setGroupId(groupId);
+        querySpellGroupRequest.setPartnerId(partnerId);
+        querySpellGroupRequest.setSessionId(sessionId);
+        querySpellGroupRequest.setActivityCode(activityCode);
+        QuerySpellGroupVoResponse querySpellGroupVoResponse = promotionDiscountClient.queryByGroupId(querySpellGroupRequest);
+        if(!ResponseResult.SUCCESS.getCode().equals(querySpellGroupVoResponse.getCode()) || querySpellGroupVoResponse.getResult() == null){
+            return null;
+        }
+        return querySpellGroupVoResponse.getResult();
+    }
+
 
 
 

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

@@ -41,10 +41,7 @@ import cn.freemud.entities.dto.order.FacePayRequestDto;
 import cn.freemud.entities.dto.order.FacePayResponseDto;
 import cn.freemud.entities.dto.pay.CombPayResponse;
 import cn.freemud.entities.dto.product.*;
-import cn.freemud.entities.dto.promotion.GroupWorkQueryRequest;
-import cn.freemud.entities.dto.promotion.GroupWorkQueryResponse;
-import cn.freemud.entities.dto.promotion.GroupWorkRefundRequest;
-import cn.freemud.entities.dto.promotion.GroupWorkRefundResponse;
+import cn.freemud.entities.dto.promotion.*;
 import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.dto.shoppingCart.CollageOrderDto;
@@ -1660,6 +1657,13 @@ public class OrderServiceImpl implements Orderservice {
             joinPayGift(sessionId, queryOrderResponseVo, partnerId, null);
         }
 
+        //拼团订单
+        if(queryOrderResponseVo.getMarketingType() == 2 && StringUtils.isNotEmpty(queryOrderResponseVo.getSpellGroupCode())
+        && orderBean.getApportionDetails()!=null){
+            QuerySpellGroupVo querySpellGroupVo = spellGroupOrderDataManager.queryByGroupId(queryOrderResponseVo.getSpellGroupCode(),
+            "",orderBean.getApportionDetails().get(0).getExternalObjectId(),partnerId);
+            queryOrderResponseVo.setSpellGroup(querySpellGroupVo);
+        }
 
         buildQueryOrderResponseVo(queryOrderResponseVo, response, partnerId);
 

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

@@ -123,7 +123,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
         createSpellGroupOrderDto.setUserId(userLoginInfoDto.getMemberId());
         createSpellGroupOrderDto.setNickName(userLoginInfoDto.getNickName());
         /*团id不为空，调用促销查询团是否关闭,关闭之后给提示不可下单*/
-        //查询团信息，校验团状态是否正常 todo
+        //查询团信息，校验团状态是否正常
         if(!StringUtils.isEmpty(createSpellGroupOrderReq.getSpellGroupCode())){
             GroupWorkQueryRequest groupWorkQueryRequestBefore = spellGroupOrderAdapter.groupWorkQueryRequest(createSpellGroupOrderDto);
             GroupWorkQueryResponse groupWorkQueryResponse = spellGroupOrderDataManager.groupWorkQuery(groupWorkQueryRequestBefore);
@@ -162,7 +162,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
         }
         //促销和产品给出规则，如果促销返回的价格是商品原价，则表示库存不足或者活动关闭 == 拼团的商品价格，肯定比商品原价低
         if (activityCalculationDiscountResponseDto.getResult().getTotalAmount().equals(productInfosDto.get(0).getOriginalPrice())) {
-            return ResponseUtil.error(ResponseResult.SPELL_GROUP_ACTIVITE_AMOUNT_ERROR);
+//            return ResponseUtil.error(ResponseResult.SPELL_GROUP_ACTIVITE_AMOUNT_ERROR);
         }
         createSpellGroupOrderDto.setActivityCalculationDiscountResponseDto(activityCalculationDiscountResponseDto);
         //转换费用信息->查询配送费

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

@@ -19,6 +19,7 @@ import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.ActivityQueryRequestDto;
 import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
 import cn.freemud.entities.dto.promotion.*;
+import cn.freemud.entities.vo.QuerySpellGroupRequest;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -69,12 +70,21 @@ public interface PromotionDiscountClient {
 
 
     /**
-     * 查询团信息
+     * 支付回调时，参团
      * @param groupWorkJoinRequest
      * @return
      */
     @PostMapping("/groupwork/join")
     GroupWorkJoinResponse groupWorkJoin(GroupWorkJoinRequest groupWorkJoinRequest);
 
+    /**
+     * 通过团号查询团信息
+     * @param querySpellGroupRequest
+     * @return
+     */
+    @PostMapping("/promotionActivity/groupWork/queryByGroupId")
+    QuerySpellGroupVoResponse queryByGroupId(QuerySpellGroupRequest querySpellGroupRequest);
+
+
 
 }