修改商品

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

@@ -185,14 +185,13 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
 
             //卖出后商品下架
             itemDao.updateOnSale(itemId);
-
             //插入操作记录
             ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
             consignSaleRecord.setSaleId(dto.getSaleId());
             consignSaleRecord.setCreateTime(new Date());
             consignSaleRecord.setContent("成交金额: " + dto.getDealPrice() + " 元");
-            consignSaleRecord.setRemark("成交平台: " + dto.getRemark());
-            consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.VALUATE.getCode());
+            consignSaleRecord.setRemark("成交平台: " + dto.getRemark() == null ? "" :  dto.getRemark());
+            consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.FINISH.getCode());
             consignSaleRecordDao.insert(consignSaleRecord);
             return Result.success();
         } catch (Exception e) {

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

@@ -90,7 +90,7 @@ public class ConsignSaleEnum {
     public enum OperateTypeEnum {
         VALUATE(1, "图文估价"),
         IDENTIFY(4, "实物鉴定"),
-        WAIT_TAKE(10, "寄售单完成"),
+        FINISH(10, "寄售单完成"),
         CUSTOM_CANCEL(20, "用户取消寄售"),
         SYS_CANCEL(21, "平台取消寄售"),
         ;

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

@@ -952,7 +952,7 @@ public class ItemServiceImpl implements ItemService {
             if (Objects.isNull(item)) {
                 return Result.failed("数据异常，该藏品不存在");
             }
-            List<ConsignSale> consignSales = consignSaleDao.findByItemId(dto.getItemId());
+            List<ConsignSale> consignSales = consignSaleDao.findByItemId(dto.getId());
             long count = consignSales.stream().filter(consignSale -> consignSale.getCustomState().intValue() == ConsignSaleEnum.SaleForUserStateEnum.CONSIGN_SALEING.getCode()).count();
             if (count > 0) {
                 return Result.failed("该藏品正在寄售中，不能编辑");