Merge remote-tracking branch 'origin/qa' into qa

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -241,6 +241,7 @@ public class    BaseCreateOrderRequest extends BaseConfig {
         private Integer maxNum;
         private Integer validityDateDays;
         private Boolean storeLevel;
+        private Integer isContinueExchange;
 
     }
 

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

@@ -2188,7 +2188,7 @@ public class OrderAdapter {
             return orderAccountVos;
         }
         List<Integer> list = Arrays.asList(OrderSettlementType.FULL_REDUCTION.getIndex(),OrderSettlementType.CASH_COUPON.getIndex(),
-                OrderSettlementType.PRODUCT_COUPON.getIndex(),OrderSettlementType.DISCOUNT_COUPON.getIndex(),OrderSettlementType.POINTS.getIndex());
+                OrderSettlementType.PRODUCT_COUPON.getIndex(),OrderSettlementType.DISCOUNT_COUPON.getIndex(),OrderSettlementType.POINTS.getIndex(),OrderSettlementType.FREIGHT_COUPON.getIndex());
         for (QueryOrdersResponse.DataBean.OrderBean.OrderSettlement orderSettlement : orderSettlements){
             if(list.contains(orderSettlement.getSettlementType())){
                 OrderAccountVo accountVo = new OrderAccountVo();
@@ -2201,6 +2201,8 @@ public class OrderAdapter {
                     accountVo.setTypeName("满减");
                 } else if(type == OrderSettlementType.POINTS.getIndex()){
                     accountVo.setTypeName("积分抵扣");
+                }else if(type == OrderSettlementType.FREIGHT_COUPON.getIndex()) {
+                    accountVo.setTypeName("配送券");
                 }
                 int value = orderSettlement.getSettlementAmount().intValue();
                 accountVo.setDiscountAmount(value < 0 ? -value : value);

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -360,6 +360,7 @@ public class ShoppingCartGoodsDto {
         private Integer maxNum;
         private Integer validityDateDays;
         private Boolean storeLevel;
+        private Integer isContinueExchange;
 
     }
 

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

@@ -2988,6 +2988,7 @@ public class OrderServiceImpl implements Orderservice {
             orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime().getTime() + "");
             orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint());
             orderExtInfoDto.setSendPointStoreLevel(sendPoint.getStoreLevel());
+            orderExtInfoDto.setIsContinueExchange(sendPoint.getIsContinueExchange());
         }
         return orderExtInfoDto;
     }

order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java

@@ -683,6 +683,7 @@ public abstract class UniversalOrderService {
             orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime().getTime() + "");
             orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint());
             orderExtInfoDto.setSendPointStoreLevel(sendPoint.getStoreLevel());
+            orderExtInfoDto.setIsContinueExchange(sendPoint.getIsContinueExchange());
         }
 
         return orderExtInfoDto;

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -316,7 +316,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         orderCancelReq.setOrderClient(orderClient == null ? OrderClientType.SAAS.getIndex() : orderClient);
         orderCancelReq.setOperator(request.getOperator());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.cancelOrder(orderCancelReq,UUID.randomUUID().toString());
-        if (!ObjectUtils.equals(SUCCESS,baseResponse.getCode())) {
+        if (!ObjectUtils.equals(SUCCESS,Integer.valueOf(baseResponse.getCode()))) {
             return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);
         }
         return ResponseUtil.success();

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderSettlementType.java

@@ -34,6 +34,7 @@ public enum OrderSettlementType {
     SPELL_GROUP(25,"拼团"),
     TAKEAWAY_ADD_PRICE(46, "外卖加价购"),
     SUPER_PURCHASE(47, "超值加购"),
+    FREIGHT_COUPON(99, "配送券"),
     PRODUCT_COUPON(118, "商品券"),
 
     POINTS(200, "积分"),

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -183,6 +183,7 @@ public class OrderExtInfoDto {
     private Integer sendPointMaxNum;
     private Integer sendPointValidityDateDays;
     private Boolean sendPointStoreLevel;
+    private Integer isContinueExchange;
 
     /**
      * 唤起预支付设备号

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java

@@ -20,6 +20,7 @@ import cn.freemud.demo.controller.ShoppingCartDemoController;
 import cn.freemud.entities.dto.GetMemberInfoRequestDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.coupon.CouponAvailableRequestVo;
+import cn.freemud.enums.CouponTypeEnum;
 import cn.freemud.enums.OrderChannelType;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.service.OpenStoreIappWxappConfigService;
@@ -38,11 +39,10 @@ import com.freemud.application.sdk.api.log.LogParams;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
 import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFacade;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -51,6 +51,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -120,6 +121,15 @@ public class ShoppingCartController {
     @PostMapping(value = "/listCartGoods")
     @LogIgnore(logMessage = "listCartGoods")
     public BaseResponse listCartGoods(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
+        // 代金券 & 折扣券互斥校验
+        List<ShoppingCartInfoRequestVo.couponCode> couponCodes = request.getCouponCodes();
+        if (CollectionUtils.isNotEmpty(couponCodes) && couponCodes.size() > 1) {
+            long count = couponCodes.stream().filter(c -> c.getCouponType().compareTo(CouponTypeEnum.TYPE_1.getCode()) == 0
+                    || c.getCouponType().compareTo(CouponTypeEnum.TYPE_3.getCode()) == 0).count();
+            if (count > 2) {
+                return ResponseUtil.error(ResponseResult.SHOPPING_CART_COUPON_MUTUAL_EXCLUSION);
+            }
+        }
         ShoppingCartNewService instanceByRequest = getInstanceByRequest(request);
         if (instanceByRequest instanceof ShoppingCartNewServiceImpl && SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).newShoppingCartGray(request.getPartnerId(), request.getShopId())){
             Map requestMap = mapperFacade.map(request, Map.class);
@@ -136,6 +146,15 @@ public class ShoppingCartController {
     @PostMapping(value = "/listCartGoodsCheck")
     @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "listCartGoodsCheck")
     public BaseResponse listCartGoodsCheck(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
+        // 代金券 & 折扣券互斥校验
+        List<ShoppingCartInfoRequestVo.couponCode> couponCodes = request.getCouponCodes();
+        if (CollectionUtils.isNotEmpty(couponCodes) && couponCodes.size() > 1) {
+            long count = couponCodes.stream().filter(c -> c.getCouponType().compareTo(CouponTypeEnum.TYPE_1.getCode()) == 0
+                    || c.getCouponType().compareTo(CouponTypeEnum.TYPE_3.getCode()) == 0).count();
+            if (count > 2) {
+                return ResponseUtil.error(ResponseResult.SHOPPING_CART_COUPON_MUTUAL_EXCLUSION);
+            }
+        }
         return getInstanceByRequest(request).getGoodsListCheck(request);
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/CalculationDiscountBO.java

@@ -175,6 +175,7 @@ public class CalculationDiscountBO {
             private Integer validityDateDays;
             private Date endTime;
             private Boolean storeLevel;
+            private Integer isContinueExchange;
         }
 
         @Data

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractApportionService.java

@@ -585,6 +585,7 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
             sendPointNew.setActivityCode(discountDTO.getActivityCode());
             sendPointNew.setEndTime(discountDTO.getEndTime());
             sendPointNew.setStoreLevel(sendPointVo.getStoreLevel());
+            sendPointNew.setIsContinueExchange(sendPointVo.getIsContinueExchange());
             return sendPointNew;
         }
         return null;

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

@@ -243,6 +243,7 @@ public class ActivityCalculationDiscountResponseDto {
             private Integer exchangeNum;
             private Integer validityDateDays;
             private Boolean storeLevel;
+            private Integer isContinueExchange;
         }
 
         @Data

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

@@ -185,6 +185,7 @@ public class CalculationSharingDiscountResponseDto {
             private Integer validityDateDays;
             private Date endTime;
             private Boolean storeLevel;
+            private Integer isContinueExchange;
         }
 
         @Data

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/SendPoint.java

@@ -13,5 +13,6 @@ public class SendPoint {
     private Integer maxNum;
     private Integer validityDateDays;
     private Boolean storeLevel;
+    private Integer isContinueExchange;
 
 }

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

@@ -107,6 +107,7 @@ public enum ResponseResult {
     SHOPPING_CART_USER_HAVE_NO_COUPON("44039", "使用的商品券已失效,请重新下单"),
     SHOPPING_CART_REPLACE_GOODS("44040", "原有购物车没有商品"),
     SHOPPING_CART_REPLACE_GOODS_AND_CLEAR("44041", "因部分商品当前门店暂未售卖，将从购物车移除"),
+    SHOPPING_CART_COUPON_MUTUAL_EXCLUSION("44042", "代金券和折扣券互斥"),
 
     /**
      * 订单状态码

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

@@ -1526,6 +1526,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             sendPointNew.setActivityCode(discountDTO.getActivityCode());
             sendPointNew.setEndTime(discountDTO.getEndTime());
             sendPointNew.setStoreLevel(sendPointVo.getStoreLevel());
+            sendPointNew.setIsContinueExchange(sendPointVo.getIsContinueExchange());
             result.setSendPointVo(sendPointNew);
         }
 

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

@@ -242,6 +242,7 @@ public class CalculationSharingDiscountService {
             sendPointNew.setActivityCode(discountDTO.getActivityCode());
             sendPointNew.setEndTime(discountDTO.getEndTime());
             sendPointNew.setStoreLevel(sendPointVo.getStoreLevel());
+            sendPointNew.setIsContinueExchange(sendPointVo.getIsContinueExchange());
             result.setSendPointVo(sendPointNew);
         }