华莱士更新

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

@@ -58,6 +58,7 @@ import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPar
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
+import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
@@ -1449,8 +1450,10 @@ 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);
+                responseVo.setRefundMode(afterOrderExtInfoDto.getRefundMode());
+            }
             list.add(responseVo);
         });
         return list;

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

@@ -578,5 +578,10 @@ public class QueryOrderResponseVo {
      */
     private Integer isCouponOrder;
 
+    /**
+     * 用户申请退款原因 1=退款退货 2=只退款不退货
+     */
+    private int refundMode;
+
 
 }

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

@@ -2191,9 +2191,12 @@ public class OrderServiceImpl implements Orderservice {
             }
             // 【优化】【小程序】顾客申请退款提交时，判断当前的订单状态，是否允许申请退款
             //if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
-            boolean refundButton = orderAdapter.checkRefundButton(queryOrderByIdResponse.getData(), userInfo.getWxAppId());
-            if (!refundButton) {
-                return ResponseUtil.error(ResponseResult.ORDER_NOT_ALLOW_REFUND.getCode(), ResponseResult.ORDER_NOT_ALLOW_REFUND.getMessage());
+            //微商城订单不校验
+            if (!com.freemud.sdk.api.assortment.order.enums.OrderSourceType.SAASMALL.getCode().equalsIgnoreCase(orderBean.getSource())) {
+                boolean refundButton = orderAdapter.checkRefundButton(queryOrderByIdResponse.getData(), userInfo.getWxAppId());
+                if (!refundButton) {
+                    return ResponseUtil.error(ResponseResult.ORDER_NOT_ALLOW_REFUND.getCode(), ResponseResult.ORDER_NOT_ALLOW_REFUND.getMessage());
+                }
             }
             //}
             List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = cacheOpenPlatformPartnerWxappConfigManager.cacheSelectDefaultPage(userInfo.getWxAppId(), "2");

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

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: OrderExtInfoDto
+ * @Package com.freemud.application.sdk.api.ordercenter.request
+ * @Description:
+ * @author: ping.wu
+ * @date: 2019/4/2 20:21
+ * @version V1.0
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+package com.freemud.application.sdk.api.ordercenter.request;
+
+import lombok.Data;
+
+
+@Data
+public class AfterOrderExtInfoDto {
+
+    private int refundMode;
+
+
+}