退货列表查询各状态数量

ch-core/src/main/java/com/wwdz/ch/core/consts/ReturnOrderEnum.java

@@ -84,7 +84,7 @@ public class ReturnOrderEnum {
      */
     public enum NodeDescEnum {
         CANCEL(70, "取消寄售", ""),
-        WAIT_RETURN(80, "货品待退回", "平台人员需要在寄售单取消后3天内将货品发出。"),
+        WAIT_RETURN(80, "货品待退回", "平台会在3天内通过邮寄将货品退回。"),
         RETURNED(90, "货品已发出", ""),
         SIGNED(100, "货品已签收", ""),
 

ch-dao/src/main/java/com/wwdz/ch/db/dao/ReturnOrderDao.java

@@ -60,4 +60,12 @@ public interface ReturnOrderDao {
     long countByState(long userId, List<Integer> filterStates);
 
 
+    /**
+     * 统计包含某个状态的退货单数量
+     * @param userId
+     * @param state
+     * @return
+     */
+    long countByState(long userId, int state);
+
 }

ch-dao/src/main/java/com/wwdz/ch/db/impl/ReturnOrderDaoImpl.java

@@ -82,4 +82,15 @@ public class ReturnOrderDaoImpl implements ReturnOrderDao {
         criteria.andStateNotIn(filterStates);
         return returnOrderMapper.countByExample(example);
     }
+
+
+    public long countByState(long userId, int state) {
+        ReturnOrderExample example = new ReturnOrderExample();
+        ReturnOrderExample.Criteria criteria = example.createCriteria();
+        criteria.andUserIdEqualTo(userId);
+        criteria.andStateEqualTo(state);
+        return returnOrderMapper.countByExample(example);
+    }
+
+
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ReturnOrderServiceImpl.java

@@ -233,7 +233,7 @@ public class ReturnOrderServiceImpl implements ReturnOrderService {
             returnOrder.setReturnOrderId(dto.getReturnOrderId());
             returnOrder.setState(ReturnOrderEnum.StateEnum.FINISH.getCode());
             returnOrderDao.update(returnOrder);
-            returnOrderRecordDao.insert(dto.getReturnOrderId(), "用户确认签收", ReturnOrderEnum.OperateTypeEnum.USER_SIGNED.getCode(), null);
+            returnOrderRecordDao.insert(dto.getReturnOrderId(), ReturnOrderEnum.NodeDescEnum.SIGNED.getDes(), ReturnOrderEnum.OperateTypeEnum.USER_SIGNED.getCode(), null);
             return Result.success();
         } catch (Exception e) {
             logger.info("用户确认签收退货商品 error : {}", e);
@@ -267,6 +267,23 @@ public class ReturnOrderServiceImpl implements ReturnOrderService {
         }
     }
 
+
+    @Override
+    public Result countReturnOrderNumByState(ReturnOrderRequestDto dto) {
+        try {
+           long waitReturnNum = returnOrderDao.countByState(dto.getUserId(), ReturnOrderEnum.StateEnum.WAIT_RETURN.getCode());
+           long sendNum = returnOrderDao.countByState(dto.getUserId(), ReturnOrderEnum.StateEnum.SENDED.getCode());
+           Map<String, Long> map = new HashMap<>();
+           map.put("waitReturnNum", waitReturnNum);
+           map.put("sendNum", sendNum);
+           return Result.success(map);
+        } catch (Exception e) {
+            logger.error("统计用户各状态退货单数量 error : {}", e);
+        }
+        return Result.failed();
+
+    }
+
     /**
      * 确认超时系统默认签收
      * @param returnOrderId

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/ReturnOrderService.java

@@ -15,6 +15,14 @@ public interface ReturnOrderService {
     Result create(ReturnOrder returnOrder);
 
 
+    /**
+     * 查询用户各状态退货单的数量
+     * @param dto
+     * @return
+     */
+    Result countReturnOrderNumByState(ReturnOrderRequestDto dto);
+
+
     /**
      * 查询退货单
      * @param dto

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/ReturnOrderController.java

@@ -84,4 +84,18 @@ public class ReturnOrderController {
     }
 
 
+    @ApiOperation(value = "查询用户各状态退货单的数量")
+    @PostMapping("/countReturnOrderNumByState")
+    public Result countReturnOrderNumByState(@RequestBody ReturnOrderRequestDto dto) {
+        logger.info("【请求开始】查询用户各状态退货单的数量,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("userId", "用户id").must().number()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(ResultCode.PARAM_ERROR.getCode(), validator.getErrorInfo());
+        }
+        return returnOrderService.countReturnOrderNumByState(dto);
+    }
+
+
 }