华莱士更新

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

@@ -11,6 +11,7 @@ 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.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,6 +59,7 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
         } catch (OrderServiceException orderEx){
             return ResponseUtil.error(orderEx.getResult());
         }
+//        refundResponse.setPayRefundStatus(PayRefundStatus.SUCCESS);
         //订单同意退款
         mallOrderHandle.refundAgree(request, refundResponse, orderBean);
         // 推送pos、微信消息中心

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/QueryDeliveryTemplateResponseVo.java

@@ -34,6 +34,6 @@ public class QueryDeliveryTemplateResponseVo {
         /**
          * 是否包邮 -> true:是; false:否
          */
-        private boolean isDispatchFree;
+        private Boolean isDispatchFree;
     }
 }

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

@@ -908,7 +908,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         if (!ResponseResult.SUCCESS.getCode().equals(queryDeliveryTemplateResponseVo.getCode().toString()) || queryDeliveryTemplateResponseVo.getData() == null) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_QUERY_DELIVERY_TEMPLATE_ERR);
         }
-        boolean isDispatchFree = queryDeliveryTemplateResponseVo.getData().isDispatchFree();
+        Boolean isDispatchFree = queryDeliveryTemplateResponseVo.getData().getIsDispatchFree();
         if(!isDispatchFree) {
             deliveryAmount = Long.valueOf(null == queryDeliveryTemplateResponseVo.getData().getFreight() ? 0 : queryDeliveryTemplateResponseVo.getData().getFreight() );
         }