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

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

@@ -947,6 +947,11 @@ public class OrderAdapter {
             if (QueryOrderStatus.ORDER_CANCEL.getCode().equals(queryOrderDto.getQueryOrderStatus())) {
                 queryOrdersDto.setStatus(new Integer[]{OrderStatus.CALCEL.getCode()});
             }
+            if (QueryOrderStatus.ORDER_CANCEL_MIXUE.getCode().equals(queryOrderDto.getQueryOrderStatus())) {
+                queryOrdersDto.setStatus(new Integer[]{OrderStatus.CALCEL.getCode()});
+                queryOrdersDto.setPayStatus(new Integer[]{PayStatus.NOT_PAY.getCode()});
+            }
+
         }
 
         // 兼容历史版本，如果传参是4 查询拆程4和5
@@ -1133,7 +1138,7 @@ public class OrderAdapter {
             responseVo.setPayStatusDesc(Optional.ofNullable(PayStatus.getByCode(ordersBean.getPayStatus()))
                     .map(PayStatus::getDesc).orElse(""));
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
-            if(mcCafePartnerId.equals(ordersBean.getCompanyId())) {
+            if(mcCafePartnerId.equals(ordersBean.getCompanyId()) && StringUtils.isNotBlank(responseVo.getPayVoucher())) {
                 responseVo.setPayVoucherBarCode(Base64.getEncoder().encodeToString(
                         BarcodeUtil.generateBarCode128(responseVo.getPayVoucher(),null,null, true, true)));
             }

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

@@ -356,6 +356,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/entities/vo/QueryOrderVo.java

@@ -31,7 +31,7 @@ public class QueryOrderVo {
     @ApiModelProperty(value = "订单编号")
     private String oid;
     /**
-     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付 ,6 已取消
+     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付 ,6 已取消  7未支付取消
      */
     private Integer queryOrderStatus;
     /**

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

@@ -20,7 +20,10 @@ public enum QueryOrderStatus {
     ALL_BILL(3, "全部"),
     REFUND_BILL(4, "退款"),
     NO_PAY(5, "待支付"),
-    ORDER_CANCEL(6, "已取消");
+    ORDER_CANCEL(6, "已取消"),
+    //密雪
+    ORDER_CANCEL_MIXUE(7, "未支付已取消");
+
 
     private Integer code;
 

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

@@ -179,6 +179,12 @@ public class OrderServiceImpl implements Orderservice {
     @Value("${mcCafe.fengniao.storeId}")
     private String fnStoreId;
 
+    /**
+     * coco商户
+     */
+    @Value("#{'${coco.partnerId}'.split(',')}")
+    private List<String> cocoPartnerId;
+
     @Autowired
     private AssortmentCloudPrinterManager cloudPrinterManager;
 //    @Autowired
@@ -889,14 +895,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);
         //只有有订单时才显示用户自定义取餐信息
@@ -1149,6 +1173,7 @@ public class OrderServiceImpl implements Orderservice {
             queryOrderResponseVo.setActivityName(payGiftResponse.getActivityName());
             queryOrderResponseVo.setCoupons(payGiftResponse.getCoupons());
             queryOrderResponseVo.setWechatCouponInfo(payGiftResponse.getWechatCouponInfo());
+            queryOrderResponseVo.setActivitySendType(payGiftResponse.getSendType());
         }
     }
 
@@ -1296,6 +1321,12 @@ public class OrderServiceImpl implements Orderservice {
             queryOrderResponseVo.setRedpacketsPicture(getRedpacketsPicture(activityId));
         }
 
+        // 支付有礼
+        // 目前只有coco在订单详情参加支付有礼，且不检查订单的状态
+        if(cocoPartnerId.contains(partnerId)){
+            joinPayGift(sessionId, queryOrderResponseVo);
+        }
+
         return ResponseUtil.success(queryOrderResponseVo);
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/CalculationSharingDiscountResponseDto.java

@@ -392,6 +392,21 @@ public class CalculationSharingDiscountResponseDto {
                  * 赠送商品数量
                  */
                 private Integer sendNumber;
+
+                /**
+                 *  可兑换商品券编号
+                 */
+                private String sendCouponCode;
+
+                /**
+                 *  可兑换商品券名称
+                 */
+                private String sendCouponName;
+
+                /**
+                 *  是否已选择寄杯
+                 */
+                private Boolean sendCoupon ;
             }
         }
 

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -12,9 +12,12 @@
  */
 package cn.freemud.entities.vo;
 
+import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
+import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import lombok.Builder;
 import lombok.Data;
 
+import java.util.Date;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -161,4 +164,47 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      */
     private String buyThreeGiveOneCouponCode;
 
-}
+    /**
+     * 总的优惠信息集合
+     */
+    private List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts;
+
+    /**
+     * 商品优惠信息
+     */
+    private List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods;
+
+    /**
+     * 用户可以选择的商品
+     */
+    private List<chooseGood> chooseGoods;
+
+    @Data
+    public static class chooseGood {
+
+
+        /**
+         * 活动类型
+         */
+        private Integer activeType;
+
+        /**
+         * 赠送商品名称
+         */
+        private String goodsName;
+
+        /**
+         * 可兑换商品券编号
+         */
+        private String couponCode ;
+
+        /**
+         *  可兑换商品券名称
+         */
+        private String couponName ;
+
+        /**
+         *  是否已选择寄杯
+         */
+        private Boolean sendCoupon;
+    }}

shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -40,6 +40,7 @@ public enum ActivityTypeEnum {
     TYPE_6(6, "买M赠N"),
     TYPE_61(61, "单品买M赠N"),
     TYPE_62(62, "买赠"),
+    TYPE_63(63, "买一赠一寄杯"),
     TYPE_7(7, "满额赠券"),
     TYPE_8(8, "满N件换购"),
     /**

shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/DeliveryFactory.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CouponService
+ * @Package cn.freemud.service
+ * @Description:
+ * @author: pengfei.liu
+ * @date: 2020/11/23
+ * @version V1.0
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.service.delivery;
+
+public interface DeliveryFactory {
+
+    /**
+     * 获取运费计算类
+     * @param orderType
+     * @param receiveId
+     * @return
+     */
+    DeliveryService getCalculateDeliveryAmount(Integer orderType,String receiveId);
+}

shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/DeliveryService.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CouponService
+ * @Package cn.freemud.service
+ * @Description:
+ * @author: pengfei.liu
+ * @date: 2020/11/23
+ * @version V1.0
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.service.delivery;
+
+import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
+
+public interface DeliveryService {
+
+    /**
+     * 计算运费
+     * @param receiveId
+     * @param partnerId
+     * @param storeId
+     * @param shoppingCartGoodsResponseVo
+     * @return
+     */
+    Long calculateDeliveryAmount(String receiveId, String partnerId, String storeId, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo);
+}

shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/AbstractDeliveryServiceImpl.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CouponService
+ * @Package cn.freemud.service
+ * @Description:
+ * @author: pengfei.liu
+ * @date: 2020/11/23
+ * @version V1.0
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.service.delivery.impl;
+
+import cn.freemud.service.delivery.DeliveryService;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public abstract class AbstractDeliveryServiceImpl implements DeliveryService {
+
+}

shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/DeliveryFactoryImpl.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CouponService
+ * @Package cn.freemud.service
+ * @Description:
+ * @author: pengfei.liu
+ * @date: 2020/11/23
+ * @version V1.0
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.service.delivery.impl;
+
+import cn.freemud.enums.CreateOrderType;
+import cn.freemud.enums.ResponseResult;
+import cn.freemud.interceptor.ServiceException;
+import cn.freemud.service.delivery.DeliveryFactory;
+import cn.freemud.service.delivery.DeliveryService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service
+public class DeliveryFactoryImpl implements DeliveryFactory {
+
+    /**
+     * 梯度运费
+     */
+    @Autowired
+    @Qualifier("gradDeliveryService")
+    DeliveryService gradDeliveryService;
+
+    /**
+     * 固定运费
+     */
+    @Autowired
+    @Qualifier("fixDeliveryService")
+    DeliveryService fixDeliveryServiceImpl;
+
+    @Override
+    public DeliveryService getCalculateDeliveryAmount(Integer orderType,String receiveId) {
+
+        // 如果订单的收获地址为空，且订单是外卖单，使用固定运费
+        if (StringUtils.isBlank(receiveId) && Objects.equals(orderType, CreateOrderType.TAKE_OUT.getCode())) {
+            return fixDeliveryServiceImpl;
+        }else if(StringUtils.isNotBlank(receiveId)){
+            return gradDeliveryService;
+        }
+
+        throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
+
+    }
+}

shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/FixDeliveryServiceImpl.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CouponService
+ * @Package cn.freemud.service
+ * @Description:
+ * @author: pengfei.liu
+ * @date: 2020/11/23
+ * @version V1.0
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.service.delivery.impl;
+
+import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
+import cn.freemud.enums.CreateOrderType;
+import cn.freemud.enums.ResponseResult;
+import cn.freemud.interceptor.ServiceException;
+import cn.freemud.service.delivery.DeliveryService;
+import cn.freemud.utils.ResponseUtil;
+import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
+import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
+import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
+import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
+import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
+import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
+import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service("fixDeliveryService")
+public class FixDeliveryServiceImpl extends AbstractDeliveryServiceImpl implements DeliveryService {
+
+    @Autowired
+    private StoreCenterService storeCenterService;
+
+    @Override
+    public Long calculateDeliveryAmount(String receiveId, String partnerId, String storeId, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
+        String trackingNo = LogThreadLocal.getTrackingNo();
+
+        // 获取门店信息，查询基础配送费用
+        StoreInfoRequest storeInfoRequest = new StoreInfoRequest(partnerId, storeId,null);
+        StoreResponse storeResponse = storeCenterService.getStoreInfo(storeInfoRequest, trackingNo);
+        if (storeResponse == null || storeResponse.getBizVO() == null) {
+            throw new ServiceException (ResponseResult.STORE_NOT_FOUND);
+        }
+
+        shoppingCartGoodsResponseVo.setDeliveryFeeZeroReason(0);
+
+        return new Double(storeResponse.getBizVO().getDeliveryPrice() * 100).longValue();
+    }
+
+}

shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/GradDeliveryServiceImpl.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CouponService
+ * @Package cn.freemud.service
+ * @Description:
+ * @author: pengfei.liu
+ * @date: 2020/11/23
+ * @version V1.0
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.service.delivery.impl;
+
+import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
+import cn.freemud.enums.ResponseResult;
+import cn.freemud.interceptor.ServiceException;
+import cn.freemud.service.delivery.DeliveryService;
+import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
+import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
+import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
+import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
+import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
+import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("gradDeliveryService")
+public class GradDeliveryServiceImpl extends AbstractDeliveryServiceImpl implements DeliveryService {
+
+    @Autowired
+    private MemberCenterService memberCenterService;
+
+    @Autowired
+    private StoreCenterService storeCenterService;
+
+    @Override
+    public Long calculateDeliveryAmount(String receiveId, String partnerId, String storeId, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
+
+        String trackingNo = LogThreadLocal.getTrackingNo();
+
+        QueryReceiveAddressRequest queryReceive = new QueryReceiveAddressRequest(receiveId, partnerId);
+        //查询会员收获地址经纬度
+        com.freemud.application.sdk.api.base.BaseResponse<QueryReceiveAddressResponse> queryReceiveAddressResponse = memberCenterService.queryReceiveAddressById(queryReceive, trackingNo);
+        if (!ResponseResult.SUCCESS.getCode().equals(queryReceiveAddressResponse.getCode()) || queryReceiveAddressResponse.getData() == null) {
+            throw new ServiceException(ResponseResult.USER_GETRECEIVEADDRESS_ERROR);
+        }
+
+        // 查询运费详情
+        QueryDeliveryRequest queryDeliveryRequest = new QueryDeliveryRequest();
+        queryDeliveryRequest.setPartnerId(partnerId);
+        queryDeliveryRequest.setStoreCode(storeId);
+        queryDeliveryRequest.setUserLatitude(queryReceiveAddressResponse.getData().getLatitude());
+        queryDeliveryRequest.setUserLongitude(queryReceiveAddressResponse.getData().getLongitude());
+        com.freemud.application.sdk.api.base.BaseResponse<QueryDeliverDetailResponse> queryDeliverDetailResponse = storeCenterService.queryDeliverDetail(queryDeliveryRequest, trackingNo);
+        if (queryDeliverDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(queryDeliverDetailResponse.getCode()) || queryDeliverDetailResponse.getData() == null) {
+            throw new ServiceException(ResponseResult.STORE_ITEM_NOT_DELIVERY);
+        }
+        if(queryDeliverDetailResponse.getData().getDeliveryAmount() == null) {
+            throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
+        }
+        shoppingCartGoodsResponseVo.setDeliveryFeeZeroReason(queryDeliverDetailResponse.getData().getDeliveryFeeZeroReason() != null ? queryDeliverDetailResponse.getData().getDeliveryFeeZeroReason() : 0);
+
+        return queryDeliverDetailResponse.getData().getDeliveryAmount();
+    }
+}

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingCartService.java

@@ -51,6 +51,9 @@ public class CalculationSharingCartService {
     @Autowired
     private CalculationCommonService calculationCommonService;
 
+    @Autowired
+    private BuyOneGiveOneSendService buyOneGiveOneSendService;
+
     /**
      * 响应购物车价格计算依赖促销
      */
@@ -109,5 +112,10 @@ public class CalculationSharingCartService {
             calculationCommonService.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
         }
 
+        /**
+         * 买一赠一寄杯
+         */
+        buyOneGiveOneSendService.giftResponse(discountResult, cartGoodsList, shoppingCartInfoRequestVo, activityQueryDto,shoppingCartGoodsResponseVo);
+
     }
 }