配送费计算逻辑修改

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

@@ -1304,7 +1304,6 @@ public class OrderAdapter {
             if (IappIdType.WC_XCX.getCode().equals(iAppId)) {
                 responseVo.setOrderTypeDesc("围餐");
             }else if(OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(ordersBean.getOrderClient())){
-                responseVo.setOrderType(OrderType.MALL.getCode());
                 responseVo.setOrderTypeDesc("商城订单");
             } else{
                 responseVo.setOrderTypeDesc(Optional.ofNullable(OrderTypeGather.getByCode(ordersBean.getType())) .map(OrderTypeGather::getDesc).orElse(""));

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

@@ -2223,9 +2223,7 @@ public class OrderServiceImpl implements Orderservice {
                     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;
-                        }
+                        isRefundDeliveryFee = freightRefundSupported;
                     }
                 }
             }else {