退款状态展示问题修复

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

@@ -665,7 +665,7 @@ public class OrderAdapter {
             }
         }else if (Objects.equals(createOrderVo.getOrderType(), OrderType.MALL.getCode())) {
             orderType = OrderType.MALL.getCode();
-            receiveAddress = (userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveProvince()+ ","+userDeliveryInfoDto.getReceiveCity()+ ","  +userDeliveryInfoDto.getReceiveRegion()+ ","  +  userDeliveryInfoDto.getReceiveAddress() : "");
+            receiveAddress = (userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveProvince()+userDeliveryInfoDto.getReceiveCity()+userDeliveryInfoDto.getReceiveRegion()+ userDeliveryInfoDto.getReceiveAddress() : "");
             createOrderVo.setMobile(userDeliveryInfoDto.getReceiveMobile());
             createOrderVo.setUserName(userDeliveryInfoDto.getReceiveUserName());
         } else {
@@ -4284,6 +4284,8 @@ public class OrderAdapter {
                 refundStatusDesc = "退款中";
             }else if(refundBean.getStatus() == RefundStatus.COMPLETE_REFUND.getCode()){
                 return "同意退款";
+            }else{
+               return Optional.ofNullable(RefundStatus.getByCode(refundBean.getStatus())) .map(RefundStatus::getDesc).orElse("");
             }
         }else{
             refundStatusDesc = Optional.ofNullable(RefundStatus.getByCode(refundBean.getStatus())).map(RefundStatus::getDesc).orElse("");

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/QueryFreightRefundSupportedResponse.java

+package cn.freemud.entities.dto.delivery;
+
+import lombok.Data;
+
+/**
+ * @author zhiheng.zhang
+ * @title: QueryFreightRefundSupportedResponse
+ * @projectName order-group
+ * @description: TODO
+ * @date 2021/4/20上午11:04
+ */
+@Data
+public class QueryFreightRefundSupportedResponse {
+
+    private Integer code;
+
+    private String msg;
+
+    private Boolean data;
+
+}

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/QueryFreightRefundSupportedVo.java

+package cn.freemud.entities.dto.delivery;
+
+import lombok.Data;
+
+@Data
+public class QueryFreightRefundSupportedVo {
+
+    /**
+     * 商户号
+     */
+    private String partnerId;
+
+    /**
+     * 区域编号
+     */
+    private String province;
+
+}

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

@@ -444,7 +444,7 @@ public class CreateOrderVo {
     private int buyType = 0;
 
     /**
-     * 使用户省份
+     * 使用户省份code 100010 这是微信选择地址传过来的，用户查询配送费用的， 并不是北京市这种给是
      */
     private String province;
 }

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

@@ -264,6 +264,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         orderExtInfoDto.setAppid(userLoginInfoDto.getWxAppId());
         orderExtInfoDto.setSessionId(sessionId);
         orderExtInfoDto.setVersion(version);
+        orderExtInfoDto.setProvince(createOrderVo.getProvince());
         return orderExtInfoDto;
     }
 

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

@@ -2210,13 +2210,33 @@ public class OrderServiceImpl implements Orderservice {
             Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
 
             boolean isRefundDeliveryFee = true;
-            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));
-            // 0、null表示 关闭 ; 1 表示开启
-            if (null != refundDeliveryFeeConfig
-                    && Arrays.asList(OrderStatus.DISTRIBUTION.getCode(), OrderStatus.COMPLETE.getCode()).contains(orderBean.getStatus())
-                    && !ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())) {
-                isRefundDeliveryFee = false;
+            //商城查询配送费
+            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();
+                        if(null == freightRefundSupported || !freightRefundSupported){
+                            isRefundDeliveryFee = false;
+                        }
+                    }
+                }
+            }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));
+                // 0、null表示 关闭 ; 1 表示开启
+                if (null != refundDeliveryFeeConfig
+                        && Arrays.asList(OrderStatus.DISTRIBUTION.getCode(), OrderStatus.COMPLETE.getCode()).contains(orderBean.getStatus())
+                        && !ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())) {
+                    isRefundDeliveryFee = false;
+                }
             }
             // 未接单
             if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {

order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java

@@ -33,4 +33,9 @@ public interface DeliveryFeiginClient {
 
     @PostMapping("/delivery/queryDeliveryTemplate")
     QueryDeliveryTemplateResponse queryDeliveryTemplate(@RequestBody QueryDeliveryTemplateRequest queryDeliveryTemplateRequest);
+
+    @PostMapping("/delivery/isFreightRefundSupported")
+    QueryFreightRefundSupportedResponse isFreightRefundSupported(@RequestBody QueryFreightRefundSupportedVo queryDeliveryTemplateVo);
+
+
 }

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

@@ -196,9 +196,14 @@ public class OrderExtInfoDto {
     private String svcCardCode;
 
     /**
-     * 操作类型
+     * 自动确认收货时间
      */
     private String autoReceiveTime;
 
+    /**
+     * 使用户省份code 100010 这是微信选择地址传过来的，用户查询配送费用的， 并不是北京市这种给是
+     */
+    private String province;
+
 
 }