Merge remote-tracking branch 'origin/master'

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.1.60-RELEASE</version>
+    <version>2.1.61-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.3.53.RELEASE</version>
+            <version>1.3.54.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -134,4 +134,5 @@
 | 2.1.57-RELEASE |  统一升级华莱士微商城SDK   | 张志恒 | 2021-05-11|
 | 2.1.58-RELEASE |  统一升级华莱士微商城SDK   | 张志恒 | 2021-05-11|
 | 2.1.59-RELEASE |  美团聚宝盆修改为美团服务商   | 梁崇福 | 2021-05-13|
-| 2.1.60-RELEASE |  麦咖啡新增优惠类型   | 徐康 | 2021-05-13|
+| 2.1.60-RELEASE |  麦咖啡新增优惠类型   | 徐康 | 2021-05-13|
\ No newline at end of file
+| 2.1.61-RELEASE |  商城退款优化   | 张志恒 | 2021-05-13|
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -249,7 +249,7 @@ public class OrderSdkAdapter {
         deliveryContactInfoCreateReq.setRelateObjectType(1);
         //联系方式类型 1:取件 2:收件
         deliveryContactInfoCreateReq.setInfoType(1);
-        deliveryContactInfoCreateReq.setContactsName(requestVO.getUserName());
+        deliveryContactInfoCreateReq.setContactsName(requestVO.getContactsName());
         deliveryContactInfoCreateReq.setMobile(requestVO.getPhone());
         deliveryContactInfoCreateReq.setLatitude(StringUtils.isBlank(requestVO.getLatitude()) ? null : new BigDecimal(requestVO.getLatitude()));
         deliveryContactInfoCreateReq.setLongitude(StringUtils.isBlank(requestVO.getLongitude()) ? null : new BigDecimal(requestVO.getLongitude()));

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

@@ -42,6 +42,10 @@ public class    BaseCreateOrderRequest extends BaseConfig {
      */
     private String userName;
     /**
+     * 收货名姓名
+     */
+    private String contactsName;
+    /**
      * 三方单号
      */
     private String thirdOrderCode;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/OrderCenterSdkService.java

@@ -363,6 +363,11 @@ public interface OrderCenterSdkService {
     BaseOrderResponse mallOrderRefundComplete(BaseQueryOrderRequest baseQueryOrderRequest);
 
     /**
+     * 商城订单同意并退款完成 POS
+     */
+    BaseOrderResponse adultApproveWithRefundComplete(BaseQueryOrderRequest baseQueryOrderRequest);
+
+    /**
      * 商城订单同意并退货完成 POS
      */
     BaseOrderResponse mallOrderRefundReturn(BaseQueryOrderRequest baseQueryOrderRequest);

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -2055,6 +2055,21 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     }
 
     @Override
+    public BaseOrderResponse adultApproveWithRefundComplete(BaseQueryOrderRequest baseQueryOrderRequest) {
+        AfterSalesOperateReq request = new AfterSalesOperateReq();
+        request.setOrderCode(baseQueryOrderRequest.getOrderId());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
+        request.setOrderClient(OrderClientType.SAASMALL.getIndex());
+        request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
+        request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
+        request.setAdultRemark(baseQueryOrderRequest.getReason());
+        request.setOperator(baseQueryOrderRequest.getOperator());
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultApproveWithRefundComplete(request, baseQueryOrderRequest.getTrackingNo());
+        return orderSdkAdapter.convent2BaseOrderResponse(response);
+    }
+
+
+    @Override
     public BaseOrderResponse mallOrderRefundReturn(BaseQueryOrderRequest baseQueryOrderRequest) {
         AfterSalesExpressOperateReq request = new AfterSalesExpressOperateReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());

order-application-service/pom.xml

@@ -54,7 +54,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.60-RELEASE</version>
+            <version>2.1.61-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -97,6 +97,7 @@ import java.math.BigDecimal;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidKeySpecException;
 import java.text.DecimalFormat;
+import java.time.Instant;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -675,7 +676,7 @@ public class OrderAdapter {
             orderType = OrderType.MALL.getCode();
             receiveAddress = (userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveProvince()+userDeliveryInfoDto.getReceiveCity()+userDeliveryInfoDto.getReceiveRegion()+ userDeliveryInfoDto.getReceiveAddress() : "");
             createOrderVo.setMobile(userDeliveryInfoDto.getReceiveMobile());
-            createOrderVo.setUserName(userDeliveryInfoDto.getReceiveUserName());
+            createOrderVo.setContactsName(userDeliveryInfoDto.getReceiveUserName());
         } else {
             throw new ServiceException(ResponseResult.PARAMETER_MISSING, "非法的订单类型");
         }
@@ -1482,11 +1483,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());
@@ -3230,7 +3236,8 @@ public class OrderAdapter {
         createOrderResponseVo.setWxappId(orderPayResponse.getWxAppid());
         createOrderResponseVo.setFmId(orderPayResponse.getFmId());
         OrderPayResponse.PayOrderBean payOrderBean = orderPayResponse.getPayOrder();
-        createOrderResponseVo.setTimestamp(payOrderBean == null ? "" : payOrderBean.getTimestamp());
+        //  腾讯有数数据上报 时间戳不能为空
+        createOrderResponseVo.setTimestamp(payOrderBean == null ? Instant.now().getEpochSecond()+"" : payOrderBean.getTimestamp());
         createOrderResponseVo.setNonceStr(payOrderBean == null ? "" : payOrderBean.getNonceStr());
         createOrderResponseVo.setPackageX(payOrderBean == null ? "" : payOrderBean.getPackageX());
         createOrderResponseVo.setSignType(payOrderBean == null ? "" : payOrderBean.getSignType());

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

@@ -447,4 +447,9 @@ public class CreateOrderVo {
      * 使用户省份code 100010 这是微信选择地址传过来的，用户查询配送费用的， 并不是北京市这种给是
      */
     private String province;
+
+    /**
+     * 收货名姓名
+     */
+    private String contactsName;
 }

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-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java

@@ -117,8 +117,6 @@ public class MallOrderServiceImpl implements MallOrderService {
     @Autowired
     private OrderAdapter orderAdapter;
     @Autowired
-    private OrderAdapter mallOrderAdapter;
-    @Autowired
     private ItemServiceImpl itemService;
     @Autowired
     private ShoppingCartClient shoppingCartClient;
@@ -271,7 +269,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         OrderExtendedReq orderExtendedReq = orderAdapter.saveStoreInfo(storeResponseDto);
         //创建普通订单
         Function<Object, CreateOrderResponse> createOrder = (var -> {
-            BaseCreateOrderRequest baseCreateOrderRequest = mallOrderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto,storeResponseDto);
+            BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto,storeResponseDto);
             //查询第三方商品编号
             baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);
             //保存门店渠道信息
@@ -284,6 +282,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             mqMessageRequest.setBackOrdersNotifyActivityExchange(backOrdersNotifyActivityExchange);
             mqMessageRequest.setBackOrdersNotifyActivityQueue(backOrdersChangeOrderStatusConsumerQueue);
             createOrderRequest.setMqMessageRequest(mqMessageRequest);
+            createOrderRequest.getBaseCreateOrderRequest().setUserName(userLoginInfoDto.getNickName());
             createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
             return orderCenterSdkService.createOrderFlow(createOrderRequest);
         });

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

@@ -2240,20 +2240,20 @@ public class OrderServiceImpl implements Orderservice {
             //商城查询配送费
             if (com.freemud.sdk.api.assortment.order.enums.OrderSourceType.SAASMALL.getCode().equalsIgnoreCase(orderBean.getSource()) && StringUtils.isNotEmpty(orderBean.getExtInfo())){
 
-                JSONObject extInfoJsonObject = JSONObject.parseObject(orderBean.getExtInfo());
-                OrderExtInfoDto orderExtInfoDto = extInfoJsonObject.toJavaObject(OrderExtInfoDto.class);
-                if(null != orderExtInfoDto && null !=  orderExtInfoDto.getProvince()){
-                    String province = orderExtInfoDto.getProvince();
-                    QueryFreightRefundSupportedVo queryFreightRefundSupportedVo = new QueryFreightRefundSupportedVo();
-                    queryFreightRefundSupportedVo.setPartnerId(orderBean.getCompanyId());
-                    queryFreightRefundSupportedVo.setProvince(province);
-                    QueryFreightRefundSupportedResponse queryFreightRefundSupportedResponse = deliveryFeiginClient.isFreightRefundSupported(queryFreightRefundSupportedVo);
-                    LogUtil.info("queryFreightRefundSupportedResponse of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != queryFreightRefundSupportedResponse ? ToStringBuilder.reflectionToString(queryFreightRefundSupportedResponse) : null));
-                    if(null != queryFreightRefundSupportedResponse &&  RESPONSE_SUCCESS_CODE == queryFreightRefundSupportedResponse.getCode()){
-                        Boolean freightRefundSupported = queryFreightRefundSupportedResponse.getData();
-                        isRefundDeliveryFee = freightRefundSupported;
-                    }
-                }
+//                JSONObject extInfoJsonObject = JSONObject.parseObject(orderBean.getExtInfo());
+//                OrderExtInfoDto orderExtInfoDto = extInfoJsonObject.toJavaObject(OrderExtInfoDto.class);
+//                if(null != orderExtInfoDto && null !=  orderExtInfoDto.getProvince()){
+//                    String province = orderExtInfoDto.getProvince();
+//                    QueryFreightRefundSupportedVo queryFreightRefundSupportedVo = new QueryFreightRefundSupportedVo();
+//                    queryFreightRefundSupportedVo.setPartnerId(orderBean.getCompanyId());
+//                    queryFreightRefundSupportedVo.setProvince(province);
+//                    QueryFreightRefundSupportedResponse queryFreightRefundSupportedResponse = deliveryFeiginClient.isFreightRefundSupported(queryFreightRefundSupportedVo);
+//                    LogUtil.info("queryFreightRefundSupportedResponse of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != queryFreightRefundSupportedResponse ? ToStringBuilder.reflectionToString(queryFreightRefundSupportedResponse) : null));
+//                    if(null != queryFreightRefundSupportedResponse &&  RESPONSE_SUCCESS_CODE == queryFreightRefundSupportedResponse.getCode()){
+//                        Boolean freightRefundSupported = queryFreightRefundSupportedResponse.getData();
+//                        isRefundDeliveryFee = freightRefundSupported;
+//                    }
+//                }
             }else {
                 AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());
                 LogUtil.info("orderRefund of oid:{}, {}, {}", orderBean.getOid(), orderBean.getStatus(), (null != refundDeliveryFeeConfig ? ToStringBuilder.reflectionToString(refundDeliveryFeeConfig) : null));

order-application-service/src/main/java/cn/freemud/xxljob/OrderCountJobHandler.java

@@ -13,18 +13,15 @@ import com.freemud.application.sdk.api.constant.ResponseResultEnum;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.response.OrderCountResp;
 import com.freemud.application.sdk.api.ordercenter.response.OrderGetPartnerRequest;
+import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
-import com.xxl.job.core.handler.annotation.JobHandler;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -60,26 +57,41 @@ public class OrderCountJobHandler extends IJobHandler {
 
         OrderGetPartnerRequest build1 = OrderGetPartnerRequest.builder().type(3).build();
         // 获取需要 上报的商户号
-        BaseResponse<GetFilterPartnerResponse> filterPartner = microOpenplatformClient.getFilterPartner(build1);
-        if (filterPartner == null || filterPartner.getResult() == null) {
-            LogUtil.info("上报商户号没有数据", build1, filterPartner == null ? null : JSON.toJSONString(filterPartner));
-            return ReturnT.SUCCESS;
-        }
-        OrderCountRequestVo orderCountRequestVo = new OrderCountRequestVo();
-        Set<String> partnerFilter = getPartnerFilter(filterPartner.getResult());
-        orderCountRequestVo.setPartnerIds(partnerFilter);
-        // 时间设置 前一天
-        setBeginAndEndTime(orderCountRequestVo);
-        BaseResponse<List<OrderCountResp>> result = orderservice.selectCountOrdersByPartnerIds(orderCountRequestVo, trackingNo);
-        LogUtil.info("orderCountJobHandlersendreportordercountmsg", orderCountRequestVo, result == null ? null : JSON.toJSONString(result));
-        if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || Objects.isNull(result.getResult())) {
-            return ReturnT.SUCCESS;
+        try {
+            BaseResponse<GetFilterPartnerResponse> filterPartner = microOpenplatformClient.getFilterPartner(build1);
+            LogUtil.info("上报商户号查询结果", build1, filterPartner == null ? null : JSON.toJSONString(filterPartner));
+            if (filterPartner == null
+                    || filterPartner.getResult() == null
+                    || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(filterPartner.getCode())
+                    || filterPartner.getResult().getPartnerFilterVos() == null
+                    || filterPartner.getResult().getPartnerFilterVos().isEmpty()) {
+                return ReturnT.SUCCESS;
+            }
+            OrderCountRequestVo orderCountRequestVo = new OrderCountRequestVo();
+            Set<String> partners = getPartnerFilter(filterPartner.getResult());
+            if (partners.isEmpty()) {
+                return ReturnT.SUCCESS;
+            }
+            orderCountRequestVo.setPartnerIds(partners);
+            // 时间设置 前一天
+            setBeginAndEndTime(orderCountRequestVo);
+            BaseResponse<List<OrderCountResp>> result = orderservice.selectCountOrdersByPartnerIds(orderCountRequestVo, trackingNo);
+            if (Objects.isNull(result)) {
+                return ReturnT.SUCCESS;
+            }
+            LogUtil.info("orderCountJobHandlersendreportordercountmsg", orderCountRequestVo, JSON.toJSONString(result));
+
+            if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || Objects.isNull(result.getResult())) {
+                return ReturnT.SUCCESS;
+            }
+            // 每次推送 只能 50条 让生态端处理
+            List<OrderCountResp> orderCounts = result.getResult();
+            SendOrderCountsMsg build = SendOrderCountsMsg.builder().orders(orderCounts).build();
+            BaseResponse baseResponse = microOpenplatformClient.addOrderSum(build);
+            LogUtil.info("orderCountJobHandlersendreportorderend", null, JSON.toJSONString(baseResponse));
+        } catch (Exception e) {
+            LogUtil.error("orderCountJobHandlersendreportorderend", null, JSON.toJSONString(e));
         }
-        // 每次推送 只能 50条 让生态端处理
-        List<OrderCountResp> orderCounts = result.getResult();
-        SendOrderCountsMsg build = SendOrderCountsMsg.builder().orders(orderCounts).build();
-        BaseResponse baseResponse = microOpenplatformClient.addOrderSum(build);
-        LogUtil.info("orderCountJobHandlersendreportorderend", null,  JSON.toJSONString(baseResponse));
         return ReturnT.SUCCESS;
     }
 
@@ -106,8 +118,8 @@ public class OrderCountJobHandler extends IJobHandler {
 
 
     private Set<String> getPartnerFilter(GetFilterPartnerResponse data) {
-        if (data.getPartnerFilterVos().isEmpty()) {
-            return null;
+        if (data.getPartnerFilterVos() == null || data.getPartnerFilterVos().isEmpty()) {
+            return new HashSet<>();
         }
         return data.getPartnerFilterVos().stream().map(PartnerFilterResponse::getPartnerId).collect(Collectors.toSet());
     }

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.60-RELEASE</version>
+            <version>2.1.61-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/service/handle/MallOrderHandle.java

@@ -9,6 +9,7 @@ import cn.freemud.management.util.ResponseUtil;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
+import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum;
 import com.freemud.application.sdk.api.ordercenter.request.OrderModifyRelatingCodeReq;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
@@ -58,9 +59,12 @@ public class MallOrderHandle {
     public BaseResponse refundAgree(OrderManagerRequest request, PayRefundResponse refundResponse, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         BaseQueryOrderRequest refundAgreeRequest = orderSdkAdapter.getRefundAgreeRequest(refundResponse.getRefundId(), request.getReason(), request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = null;
-        if (PayRefundStatus.SUCCESS.equals(refundResponse.getPayRefundStatus())) {
+        if (PayRefundStatus.SUCCESS.equals(refundResponse.getPayRefundStatus()) && RefundModeEnum.REFUND_ALL.getIndex() == orderBean.getRefundList().get(0).getRefundMode()) {
             baseOrderResponse = orderCenterSdkService.mallOrderRefundComplete(refundAgreeRequest);
-        } else {
+        }else if(PayRefundStatus.SUCCESS.equals(refundResponse.getPayRefundStatus()) && RefundModeEnum.UN_REFUND_GOODS.getIndex() == orderBean.getRefundList().get(0).getRefundMode()){
+            baseOrderResponse = orderCenterSdkService.adultApproveWithRefundComplete(refundAgreeRequest);
+        }
+        else {
             baseOrderResponse = orderCenterSdkService.mallOrderRefundReturn(refundAgreeRequest);
         }
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {

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 {

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.3.53.RELEASE</version>
+    <version>1.3.54.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -84,5 +84,5 @@
 | 1.3.51.RELEASE |  华莱士商城SDK统一升级   | 张志恒 | 2021-05-11 |
 | 1.3.52.RELEASE | 美团聚宝盆更名为美团服务商 | 梁崇福 | 2021-05-13 |
 | 1.3.53.RELEASE | 麦咖啡新增优惠类型 | 徐康 | 2021-05-13 |
-
+| 1.3.54.RELEASE | 商城退款优化 | 张志恒 | 2021-05-13 |
 

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

@@ -938,7 +938,10 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
     }
 
     public Long calculateDeliveryAmount(String partnerId,String province,List<CartGoods> cartGoodsList) {
-        Long deliveryAmount = 0L;
+        Long deliveryAmount = 200L;
+        if(1==1){
+            return deliveryAmount;
+        }
         //区code 为空则运费为0
         if (StringUtils.isBlank(province)) {
             return deliveryAmount;

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);
         }