sdk升级

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

@@ -4399,7 +4399,7 @@ public class OrderAdapter {
         if(orderStatusList.contains(orderBean.getStatus()) && (null == afterSalesOrderResp || (null !=afterSalesOrderResp &&  AfterSalesStatus.CANCEL.getIndex() == afterSalesOrderResp.getAfterSalesStatus()))){
             refundButtonDisable = true;
         }
-        if(null == orderBean.getAfterSalesOrderResp() && (DateUtil.addDays(new Date(orderBean.getGmtDelivery()),30)).compareTo(new Date()) ==1){
+        if(null == orderBean.getAfterSalesOrderResp() && null != orderBean.getGmtDelivery() && (DateUtil.addDays(new Date(orderBean.getGmtDelivery()),30)).compareTo(new Date()) ==1){
             refundButtonDisable = false;
         }
         return refundButtonDisable;

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

@@ -2220,7 +2220,8 @@ public class OrderServiceImpl implements Orderservice {
                 if (RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
                     return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "商家正在处理中，请稍后……");
                 }
-                if (RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
+                //商城订单可二次发起退款
+                if (!com.freemud.sdk.api.assortment.order.enums.OrderSourceType.SAASMALL.getCode().equalsIgnoreCase(orderBean.getSource())  && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
                     return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "您的申请已被商家拒绝，请联系门店沟通。");
                 }
             }
@@ -2239,7 +2240,6 @@ public class OrderServiceImpl implements Orderservice {
             boolean isRefundDeliveryFee = true;
             //商城查询配送费
             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()){