Merge branch 'feature/20210414_华莱士微商城申请退款_wangshichang' into feature/20210420-华莱士公用分支-张志恒

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -4,6 +4,7 @@ import cn.freemud.base.constant.Version;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.freemud.application.sdk.api.couponcenter.offline.domain.ProductRedeemVO;
 import com.freemud.application.sdk.api.couponcenter.offline.domain.TransactionVO;
 import com.freemud.application.sdk.api.couponcenter.offline.request.CouponLockRequest;
@@ -1013,6 +1014,21 @@ public class OrderSdkAdapter {
             //售后单状态 1:待处理 2:退货中 3:拒绝退款 4:已退货 5:完成 6:取消
             refundBean.setStatus(getOldOrderRefundStatus(afterSalesOrderResp.getAfterSalesStatus()));
             refundBean.setCreateTime(afterSalesOrderResp.getCreateTime());
+            refundBean.setExtInfo(afterSalesOrderResp.getExtInfo());
+            if (StringUtils.isNotBlank(afterSalesOrderResp.getExtInfo())) {
+                AfterOrderExtInfoDto extInfoDto = JSONObject.parseObject(afterSalesOrderResp.getExtInfo(), new TypeReference<AfterOrderExtInfoDto>() {
+                }.getType());
+                if (extInfoDto != null) {
+                    RefundModeEnum refundModeEnum;
+                    if ((refundModeEnum = RefundModeEnum.getByIndex(extInfoDto.getRefundMode())) != null) {
+                        refundBean.setRefundMode(refundModeEnum.getIndex());
+                        refundBean.setRefundModeDesc(refundModeEnum.getName());
+                    }
+                    refundBean.setBatchRefundId(extInfoDto.getBatchRefundId());
+                }
+
+            }
+
             refundBeans.add(refundBean);
         }
         return refundBeans;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -793,12 +793,36 @@ public class QueryOrdersResponse {
                 private Integer status;
 
                 private String remark;
-                //商家退单审核 备注
+                /**
+                 * 商家退单审核 备注
+                 */
                 private String decisionReason;
 
-                //创建时间
+                /**
+                 * 售后单创建时间
+                 */
                 private String createTime;
 
+                /**
+                 * 拓展信息
+                 */
+                private String extInfo;
+
+                /**
+                 * 退款方式
+                 */
+                private Byte refundMode;
+
+                /**
+                 * 退款方式说明
+                 */
+                private String refundModeDesc;
+
+                /**
+                 * 批量退款批次号
+                 */
+                private Long batchRefundId ;
+
             }
 
             @NoArgsConstructor

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

@@ -18,8 +18,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * 用户退货快递信息
  *

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

@@ -12,11 +12,7 @@
  */
 package cn.freemud.entities.vo;
 
-import cn.freemud.enums.RefundModeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.NotEmpty;
 
 /**
  * 拼团批量退款申请

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

@@ -43,7 +43,6 @@ import cn.freemud.utils.ValidationCode;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerWxappConfig;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
@@ -62,6 +61,7 @@ import com.freemud.application.sdk.api.log.ThirdPartyLog;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
+import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.request.POSOrderOperationBaseReq;
@@ -85,7 +85,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.ToStringBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -95,8 +94,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
-
 @Slf4j
 @Service
 public class MallOrderServiceImpl implements MallOrderService {

order-application-service/src/main/java/cn/freemud/enums/RefundModeEnum.java → ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/RefundModeEnum.java

-package cn.freemud.enums;
+package com.freemud.application.sdk.api.ordercenter.enums;
 
 import lombok.Getter;
 

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

@@ -18,7 +18,14 @@ import lombok.Data;
 @Data
 public class AfterOrderExtInfoDto {
 
-    private int refundMode;
+    /**
+     * 微商城退款方式
+     */
+    private Byte refundMode;
+    /**
+     * 拼团订单批量退款批次号
+     */
+    private Long batchRefundId;
 
 
 }