券码核销添加

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

@@ -540,12 +540,6 @@ public class MallOrderServiceImpl implements MallOrderService {
         orderIds.add(orderBean.getOid());
         orderIds = orderIds.stream().distinct().collect(Collectors.toList());
         //接单
-        POSOrderOperationBaseReq acceptOrderReq = new POSOrderOperationBaseReq();
-        acceptOrderReq.setOrderCode(orderBean.getOid());
-        com.freemud.application.sdk.api.ordercenter.response.BaseResponse baseResponse = orderSdkService.acceptOrder(acceptOrderReq, LogTreadLocal.getTrackingNo());
-        if(baseResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(baseResponse.getCode())) {
-            orderRefund(orderBean, "接单失败");
-            return gson.toJson(message);
 
         if(orderIds.size() > 1 || orderBean.getMarketingType() != OrderMarketType.GROUPB.getIndex()){
             POSOrderOperationBaseReq acceptOrderReq = new POSOrderOperationBaseReq();

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

@@ -30,9 +30,7 @@ import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.*;
-import cn.freemud.service.impl.calculate.CalculateCenter;
-import cn.freemud.service.impl.calculate.CalculationSharingCartService;
-import cn.freemud.service.impl.calculate.CalculationSharingDiscountService;
+import cn.freemud.service.impl.calculate.*;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationFactory;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationService;
 import cn.freemud.service.thirdparty.*;
@@ -107,7 +105,10 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
     private CouponAdapter couponAdapter;
     @Autowired
     private DeliveryFeiginClient deliveryFeiginClient;
-
+    @Autowired
+    private CalculationSharingValidatorService calculationSharingValidatorService;
+    @Autowired
+    private CalculationSharingEquallyService sharingEquallyService;
     @Value("${saas.cart.sharing}")
     private String sharing;
     /**
@@ -562,18 +563,17 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, shoppingCartInfoRequestVo.getOrderType());
         CouponPromotionVO couponPromotionVO = couponAdapter.getCouponPromotionVO(shoppingCartInfoRequestVo, userLoginInfoDto);
         List<ShoppingCartInfoRequestVo.SendGoods> sendGoods = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(sendGoodsList)) {
-            for (ShoppingCartInfoRequestVo.SendGoods sds : sendGoodsList) {
-                ShoppingCartInfoRequestVo.SendGoods sd = new ShoppingCartInfoRequestVo.SendGoods();
-                sd.setGoodsId(sds.getGoodsId());
-                if (StringUtils.isBlank(sds.getActivityCode())) continue;
-                sd.setQty(sds.getQty());
-                sd.setOriginalPrice(0L);
-                sd.setActivityCode(sds.getActivityCode());
-                sendGoods.add(sd);
-            }
+        // 当couponCode不为空时，需参与价格计算
+        if (StringUtils.isNotEmpty(couponCode)) {
+            CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
+            coupon.setCode(couponCode);
+            coupon.setActivityCode(activityCode);
+            coupons.add(coupon);
         }
-        CalculationSharingDiscountResponseDto.CalculationDiscountResult calculationSharingDiscountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType
+        // 当couponCodes不为空时，需参与价格计算,同时排除单券入参
+        buildCoupons(coupons,shoppingCartInfoRequestVo.getCouponCodes());
+
+        CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType
                 , partnerId
                 , storeId
                 , userId
@@ -582,10 +582,12 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
                 , assortmentCustomerInfoVo.isMemberPaid()
                 , cartGoodsList
                 , coupons
-                , sendGoods
+                , shoppingCartInfoRequestVo.getSendGoods()
                 , deliveryAmount
-                , null);
-        sharingCartService.distribute(calculationSharingDiscountResult
+                , shoppingCartInfoRequestVo);
+
+        // 活动校验
+        calculationSharingValidatorService.validator(discountResult
                 , cartGoodsList
                 , shoppingCartGoodsResponseVo
                 , shoppingCartInfoRequestVo
@@ -594,15 +596,20 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
                 , activityQueryDto
                 , menuType
                 , deliveryAmount
-                , ShoppingCartConstant.QUERY_INFO
-                , partnerId
-                ,shoppingCartInfoRequestVo.getFlag()
-                , userId
-                , storeId);
+                , ShoppingCartConstant.QUERY_INFO);
 
-        buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,calculationSharingDiscountResult,shoppingCartInfoRequestVo.getFlag(),partnerId);
-        //设置均摊信息
-        updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, null, shoppingCartGoodsDto, premiumExchangeActivity, shoppingCartInfoRequestVo);
+        //直接利用促销返回做均摊
+        sharingEquallyService.equally(discountResult
+                , cartGoodsList
+                , shoppingCartGoodsResponseVo
+                , shoppingCartInfoRequestVo
+                , userLoginInfoDto
+                , couponPromotionVO
+                , activityQueryDto
+                , menuType
+                , deliveryAmount
+                , shoppingCartGoodsDto
+                , premiumExchangeActivity);
 
         return ResponseUtil.success(shoppingCartGoodsDto);
     }