配送费计算调整

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

@@ -907,6 +907,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             editAfterSalesExpressRequest.setExpressNo(editAfterSalesExpressVo.getExpressNo());
             editAfterSalesExpressRequest.setExpressChannelName(editAfterSalesExpressVo.getExpressChannelName());
             editAfterSalesExpressRequest.setAfterSalesCode(orderBean.getAfterSalesOrderResp().getAfterSalesCode());
+            editAfterSalesExpressRequest.setOperator(userInfo.getNickName());
             BaseOrderResponse baseResponseDto = orderCenterSdkService.editAfterSalesExpress(editAfterSalesExpressRequest);
 
             if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {

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

@@ -72,6 +72,9 @@ public class CalculationSharingCartService {
             , Integer flag
             , String userId
             , String storeId) {
+        if (BusinessTypeEnum.SAAS_MALL.getCode().equals(menuType) && null != shoppingCartInfoRequestVo && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
+            deliverySharingService.mallDeliveryResponse(shoppingCartGoodsResponseVo, deliveryAmount,discountResult);
+        }
 
         /**
          * 用促销价格初始化购物车行记录成交价
@@ -101,9 +104,7 @@ public class CalculationSharingCartService {
          * 积分抵扣
          */
         scoreSharingService.scoreResponse(discountResult, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
-        if (BusinessTypeEnum.SAAS_MALL.getCode().equals(menuType) && null != shoppingCartInfoRequestVo && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
-            deliverySharingService.mallDeliveryResponse(shoppingCartGoodsResponseVo, deliveryAmount,discountResult);
-        }else if(BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)){
+        if(BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)){
             deliverySharingService.deliveryResponse(discountResult, activityQueryDto, shoppingCartGoodsResponseVo, deliveryAmount);
         }