Merge branch 'feature/20210414-华莱士需求-张志恒' into feature/20210513-申请退款按钮关闭-张志恒

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

@@ -1482,11 +1482,16 @@ public class OrderAdapter {
 
             //拼团信息
             responseVo.setSpellGroupCode(ordersBean.getSpellGroupCode());
-            if(null != ordersBean.getAfterSalesOrderResp() && StringUtils.isNotEmpty(ordersBean.getAfterSalesOrderResp().getExtInfo())){
-                AfterOrderExtInfoDto afterOrderExtInfoDto = JSONObject.parseObject(ordersBean.getAfterSalesOrderResp().getExtInfo(),AfterOrderExtInfoDto.class);
-                if(null !=afterOrderExtInfoDto) {
-                    responseVo.setRefundMode(afterOrderExtInfoDto.getRefundMode());
+            if(null != ordersBean.getAfterSalesOrderResp()){
+                if(StringUtils.isNotEmpty(ordersBean.getAfterSalesOrderResp().getExtInfo())) {
+                    AfterOrderExtInfoDto afterOrderExtInfoDto = JSONObject.parseObject(ordersBean.getAfterSalesOrderResp().getExtInfo(), AfterOrderExtInfoDto.class);
+                    if (null != afterOrderExtInfoDto) {
+                        responseVo.setRefundMode(afterOrderExtInfoDto.getRefundMode());
+                    }
                 }
+//                responseVo.setRefundButtonDisable(AfterSalesStatus.CANCEL.getIndex() == ordersBean.getAfterSalesOrderResp().getAfterSalesStatus() ? false : true);
+                //有售后单不显示按钮
+                responseVo.setRefundButtonDisable(false);
             }
             responseVo.setExpressChannelCode(ordersBean.getExpressChannelCode());
             responseVo.setExpressChannelName(ordersBean.getExpressChannelName());

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

@@ -630,5 +630,10 @@ public class QueryOrderResponseVo {
      */
     private Byte refundMode;
 
+    /**
+     * 是否展示申请退款按钮
+     */
+    private boolean refundButtonDisable;
+
 
 }

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

@@ -15,12 +15,16 @@ import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.service.handle.*;
 import cn.freemud.management.util.ResponseUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.constant.ResponseConstant;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesStatus;
+import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum;
+import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto;
 import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import com.netflix.discovery.converters.Auto;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -64,7 +68,16 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
     public BaseResponse<OrderManagerResponse> orderAgreeRefund(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         //取消配送单
 //        deliveryHandle.cancelDelivery(orderBean,request);
-        if(Objects.nonNull(orderBean.getAfterSalesOrderResp()) && Objects.equals(AfterSalesStatus.PENDING.getIndex(), orderBean.getAfterSalesOrderResp().getAfterSalesStatus())){
+        boolean flag = false;
+        Byte refundMode = RefundModeEnum.REFUND_ALL.getIndex();
+        if(null != orderBean.getAfterSalesOrderResp() && StringUtils.isNotEmpty(orderBean.getAfterSalesOrderResp().getExtInfo())){
+            AfterOrderExtInfoDto afterOrderExtInfoDto = JSONObject.parseObject(orderBean.getAfterSalesOrderResp().getExtInfo(),AfterOrderExtInfoDto.class);
+            if(null !=afterOrderExtInfoDto) {
+                refundMode = afterOrderExtInfoDto.getRefundMode();
+            }
+        }
+
+        if(Objects.equals(RefundModeEnum.REFUND_ALL.getIndex(),refundMode) && Objects.nonNull(orderBean.getAfterSalesOrderResp()) && Objects.equals(AfterSalesStatus.PENDING.getIndex(), orderBean.getAfterSalesOrderResp().getAfterSalesStatus())){
             // 修改售后单状态为退货中
             mallOrderHandle.mallOrderAgreeApply(request, orderBean);
         }else {

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

@@ -72,15 +72,15 @@ 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);
-        }
 
         /**
          * 用促销价格初始化购物车行记录成交价
          */
         calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo, couponPromotionVO != null ? couponPromotionVO.getCouponCode() : null);
 
+        if (BusinessTypeEnum.SAAS_MALL.getCode().equals(menuType) && null != shoppingCartInfoRequestVo && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
+            deliverySharingService.mallDeliveryResponse(shoppingCartGoodsResponseVo, deliveryAmount,discountResult);
+        }
         /**
          * 可用券及券折扣
          */

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

@@ -77,8 +77,10 @@ public class CalculationSharingEquallyService {
             , ShoppingCartGoodsDto shoppingCartGoodsDto
             , CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity) {
 
-
         calculationCommonService.initShoppingCart(discountResult, cartGoodsList, shoppingCartGoodsResponseVo, couponPromotionVO != null ? couponPromotionVO.getCouponCode() : null);
+        if (BusinessTypeEnum.SAAS_MALL.getCode().equals(menuType) && null != shoppingCartInfoRequestVo && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
+            deliverySharingService.mallDeliveryResponse(shoppingCartGoodsResponseVo, deliveryAmount,discountResult);
+        }
         /**
          * 商品券\换购券
          */
@@ -139,9 +141,7 @@ public class CalculationSharingEquallyService {
         scoreSharingService.equally(shoppingCartGoodsResponseVo, shoppingCartGoodsDto);
         calculationCommonService.getNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsDto);
 
-        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);
         }