fix:退货列表返回退款状态

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/OmsPortalOrderReturnApplyController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.mbg.model.OmsOrderReturnApply;
 import com.yonge.cooleshow.mbg.model.OmsOrderReturnReason;
 import com.yonge.cooleshow.portal.domain.OmsOrderReturnApplyParam;
 import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyResult;
+import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyVo;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyDto;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyQueryParam;
 import com.yonge.cooleshow.portal.service.OmsOrderReturnReasonService;
@@ -55,8 +56,8 @@ public class OmsPortalOrderReturnApplyController {
     @ApiOperation("分页查询退货申请")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ResponseBody
-    public CommonResult<CommonPage<OmsOrderReturnApply>> list(@RequestBody OmsReturnApplyQueryParam queryParam) {
-        List<OmsOrderReturnApply> returnApplyList = returnApplyService.list(queryParam, queryParam.getPageSize(), queryParam.getPageNum());
+    public CommonResult<CommonPage<OmsOrderReturnApplyVo>> list(@RequestBody OmsReturnApplyQueryParam queryParam) {
+        List<OmsOrderReturnApplyVo> returnApplyList = returnApplyService.list(queryParam, queryParam.getPageSize(), queryParam.getPageNum());
         return CommonResult.success(CommonPage.restPage(returnApplyList));
     }
 

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/dao/OmsOrderReturnApplyDao.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.portal.dao;
 
 import com.yonge.cooleshow.mbg.model.OmsOrderReturnApply;
 import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyResult;
+import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyVo;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyQueryParam;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,7 +16,7 @@ public interface OmsOrderReturnApplyDao {
     /**
      * 查询申请列表
      */
-    List<OmsOrderReturnApply> getList(@Param("queryParam") OmsReturnApplyQueryParam queryParam);
+    List<OmsOrderReturnApplyVo> getList(@Param("queryParam") OmsReturnApplyQueryParam queryParam);
 
     /**
      * 获取申请详情

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/dto/OmsReturnApplyQueryParam.java

@@ -26,8 +26,8 @@ public class OmsReturnApplyQueryParam {
     private Long memberId;
 
 
-    private Integer pageSize;
-    private Integer pageNum;
+    private Integer pageSize = 20;
+    private Integer pageNum =1;
 
     public Integer getPageSize() {
         return pageSize;

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/OmsPortalOrderReturnApplyService.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.portal.service;
 import com.yonge.cooleshow.mbg.model.OmsOrderReturnApply;
 import com.yonge.cooleshow.portal.domain.OmsOrderReturnApplyParam;
 import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyResult;
+import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyVo;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyDto;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyQueryParam;
 
@@ -26,7 +27,7 @@ public interface OmsPortalOrderReturnApplyService {
 
     OmsOrderReturnApplyResult getItem(Long id);
 
-    List<OmsOrderReturnApply> list(OmsReturnApplyQueryParam queryParam, Integer pageSize, Integer pageNum);
+    List<OmsOrderReturnApplyVo> list(OmsReturnApplyQueryParam queryParam, Integer pageSize, Integer pageNum);
 
     /** 设置退货单号 */
     void setDeliverySn(OmsReturnApplyDto applyDto);

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderReturnApplyServiceImpl.java

@@ -8,6 +8,7 @@ import com.yonge.cooleshow.mbg.model.UmsMember;
 import com.yonge.cooleshow.portal.dao.OmsOrderReturnApplyDao;
 import com.yonge.cooleshow.portal.domain.OmsOrderReturnApplyParam;
 import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyResult;
+import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyVo;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyDto;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyQueryParam;
 import com.yonge.cooleshow.portal.service.OmsPortalOrderReturnApplyService;
@@ -62,7 +63,7 @@ public class OmsPortalOrderReturnApplyServiceImpl implements OmsPortalOrderRetur
     }
 
     @Override
-    public List<OmsOrderReturnApply> list(OmsReturnApplyQueryParam queryParam, Integer pageSize, Integer pageNum) {
+    public List<OmsOrderReturnApplyVo> list(OmsReturnApplyQueryParam queryParam, Integer pageSize, Integer pageNum) {
         PageHelper.startPage(pageNum, pageSize);
         UmsMember currentMember = memberService.getCurrentMember();
         if (currentMember == null) {

cooleshow-mall/mall-portal/src/main/resources/config/mybatis/OmsOrderReturnApplyDao.xml

@@ -10,7 +10,7 @@
         <result column="arrival_time_" jdbcType="VARCHAR" property="arrivalTime" />
         <result column="refundStatus" jdbcType="VARCHAR" property="refundStatus" />
     </resultMap>
-    <select id="getList" resultMap="com.yonge.cooleshow.mbg.mapper.OmsOrderReturnApplyMapper.BaseResultMap">
+    <select id="getList" resultMap="returnApplyDetailResult">
         SELECT
         oora.*,
         uor.arrival_time_,