寄售单操作记录-用户下单成功

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

@@ -93,7 +93,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                     } 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());
+                        consignSaleVo.setRemark(consignSaleRecord.getRemark().startsWith("理由:")?consignSaleRecord.getRemark().split(":")[1]:consignSaleRecord.getRemark());
                     }
 
                 }

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

@@ -99,7 +99,8 @@ public class ConsignSaleEnum {
         WAIT_USER_CONFIRM_IDENTIFY(53, "建议寄售价待用户确认"),
         USER_CONFIRM_IDENTIFY(60, "建议寄售价用户确认"),
         SALEING(70, "平台寄售中"),
-        FINISH(80, "货品售出，待结款"),
+        SALED(80, "货品售出，待结款"),
+        FINISH(90, "寄售单完成"),
         CUSTOM_CANCEL(100, "用户取消寄售"),
         SYS_CANCEL(101, "平台取消寄售"),
         ;

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

@@ -89,7 +89,6 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
             consignSaleRecord.setSaleId(saleId);
             consignSaleRecord.setCreateTime(new Date());
-            consignSaleRecord.setContent("用户下单成功");
             consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.CREATE_ORDER.getCode());
             consignSaleRecordDao.insert(consignSaleRecord);