寄售单操作记录

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ConsignSaleServiceImpl.java

@@ -77,6 +77,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                     String[] image = item.getImages().split(";");
                     consignSaleVo.setItemImg(image[0]);
                 }
+
                 consignSaleVo.setSaleId(consignSale.getSaleId());
                 consignSaleVo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
                 consignSaleVo.setItemName(item.getName());
@@ -88,9 +89,13 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                     List<Integer> operateType = consignSaleRecords.stream().map(ConsignSaleRecord::getType).collect(Collectors.toList());
                     if (operateType.contains(ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode())) {
                         consignSaleVo.setCancelType(ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getDes());
+                        consignSaleVo.setRemark("用户主动取消");
                     } else {
                         consignSaleVo.setCancelType(ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getDes());
+                        ConsignSaleRecord consignSaleRecord = consignSaleRecords.stream().filter(s->s.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode()).collect(Collectors.toList()).get(0);
+                        consignSaleVo.setRemark(consignSaleRecord.getRemark());
                     }
+
                 }
                 consignSaleVoList.add(consignSaleVo);
             });
@@ -156,7 +161,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
             consignSaleRecord.setSaleId(dto.getSaleId());
             consignSaleRecord.setCreateTime(new Date());
-            consignSaleRecord.setContent("估价金额: " + dto.getImgValuation());
+            consignSaleRecord.setContent("估价金额: " + dto.getImgValuation() + " 元");
             consignSaleRecord.setRemark(dto.getRemark());
             consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.VALUATE.getCode());
             consignSaleRecordDao.insert(consignSaleRecord);
@@ -183,6 +188,13 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             consignSaleRecord.setRemark(dto.getRemark());
             consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.IDENTIFY.getCode());
             consignSaleRecordDao.insert(consignSaleRecord);
+
+            //平台寄售中
+            ConsignSaleRecord saleRecord = new ConsignSaleRecord();
+            saleRecord.setSaleId(dto.getSaleId());
+            saleRecord.setCreateTime(new Date());
+            saleRecord.setType(ConsignSaleEnum.OperateTypeEnum.SALEING.getCode());
+            consignSaleRecordDao.insert(saleRecord);
             return Result.success();
         } catch (Exception e) {
             logger.error("实物鉴定 error:{}", e);
@@ -210,7 +222,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             consignSaleRecord.setSaleId(dto.getSaleId());
             consignSaleRecord.setCreateTime(new Date());
             consignSaleRecord.setContent("成交金额: " + dto.getDealPrice() + " 元");
-            consignSaleRecord.setRemark("成交平台: " + dto.getRemark() == null ? "" :  dto.getRemark());
+            consignSaleRecord.setRemark("成交平台: " + (dto.getRemark() == null ? "" :  dto.getRemark()));
             consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.FINISH.getCode());
             consignSaleRecordDao.insert(consignSaleRecord);
             return Result.success();

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

@@ -88,14 +88,18 @@ public class ConsignSaleEnum {
 
 
     public enum OperateTypeEnum {
-        CREATE_ORDER(0, "用户下单"),
+        CREATE_ORDER(0, "用户下单成功"),
         VALUATE(10, "图文估价"),
-        USER_CONFIRM_VALUATE(20, "用户确认图文估价"),
-        USER_SEND(30, "用户寄出商品"),
-        CONFIRM_RECEIVE(40, "系统确认签收"),
-        IDENTIFY(50, "实物鉴定"),
-        USER_CONFIRM_IDENTIFY(50, "用户确认最终定价"),
-        FINISH(80, "寄售单完成"),
+        WAIT_USER_CONFIRM_VALUATE(15, "初步估价待用户确认"),
+        USER_CONFIRM_VALUATE(20, "初步估价用户确认"),
+        WAIT_USER_SEND(23, "待用户寄出"),
+        USER_SEND(30, "平台待收货"),
+        CONFIRM_RECEIVE(40, "平台货品签收"),
+        IDENTIFY(50, "平台实物鉴定并估价"),
+        WAIT_USER_CONFIRM_IDENTIFY(53, "建议寄售价待用户确认"),
+        USER_CONFIRM_IDENTIFY(60, "建议寄售价用户确认"),
+        SALEING(70, "平台寄售中"),
+        FINISH(80, "货品售出，待结款"),
         CUSTOM_CANCEL(100, "用户取消寄售"),
         SYS_CANCEL(101, "平台取消寄售"),
         ;

ch-core/src/main/java/com/wwdz/ch/core/entity/ConsignSaleVo.java

@@ -96,4 +96,9 @@ public class ConsignSaleVo implements Entity {
      * 如果是取消的状态显示取消类型
      */
     private String cancelType;
+
+    /**
+     * 原因
+     */
+    private String remark;
 }

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

@@ -94,6 +94,7 @@ public class ItemDaoImpl implements ItemDao {
         ItemExample example = new ItemExample();
         ItemExample.Criteria criteria = example.createCriteria();
         example.setOrderByClause("create_time asc");
+        JdbcHelper.ifPresent(coinRequestDto.getKind(), criteria :: andKindEqualTo);
         JdbcHelper.ifPresent(coinRequestDto.getIsDeleted(), criteria::andIsDeletedEqualTo);
         JdbcHelper.ifPresent(coinRequestDto.getCid(), criteria::andCidEqualTo);
         JdbcHelper.ifPresent(coinRequestDto.getStartUpdateTime(), criteria::andUpdateTimeGreaterThan);