已寄售的商品不再寄售

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

@@ -7,6 +7,7 @@ import com.wwdz.ch.admin.entity.vo.ItemVo;
 import com.wwdz.ch.admin.service.ConsignSaleService;
 import com.wwdz.ch.admin.service.ItemService;
 import com.wwdz.ch.core.consts.ConsignSaleEnum;
+import com.wwdz.ch.core.consts.ItemStateEnum;
 import com.wwdz.ch.core.entity.ConsignSaleVo;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.MediaUtil;
@@ -184,7 +185,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             consignSaleDao.update(consignSale);
 
             //卖出后商品下架
-            itemDao.updateOnSale(itemId);
+            itemDao.updateOnSale(itemId, ItemStateEnum.SALED.getCode());
             //插入操作记录
             ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
             consignSaleRecord.setSaleId(dto.getSaleId());
@@ -212,7 +213,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode());
             consignSaleDao.update(consignSale);
             //商品下架
-            itemDao.updateOnSale(itemId);
+            itemDao.updateOnSale(itemId, ItemStateEnum.SHELVE.getCode());
 
             //插入记录
             ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();

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

@@ -9,6 +9,7 @@ public enum ItemStateEnum {
     SHELVE(1, "暂不处理"),
     DELETED(9, "已删除"),
     FINISH(10, "已完成"),
+    SALED(20, "已完成寄售"),
     ;
 
     private int code;

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

@@ -138,10 +138,10 @@ public interface ItemDao {
 
     /**
      * 商品下架
-     * @param itemId
+     * @param itemId, state
      * @return
      */
-    boolean updateOnSale(long itemId);
+    boolean updateOnSale(long itemId, int state);
 
 
 //--------------------------承接原来用户发布商品关联表--------------------------//

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

@@ -107,6 +107,7 @@ public class ItemDaoImpl implements ItemDao {
         ItemExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(coinRequestDto.getUserId(), criteria::andUserIdEqualTo);
         JdbcHelper.ifPresent(coinRequestDto.getIsOnSale(), criteria::andIsOnSaleEqualTo);
+        criteria.andStateNotEqualTo(coinRequestDto.getState());
         criteria.andIsDeletedEqualTo(false);
         example.setOrderByClause("update_time desc");
         PageHelper.startPage(coinRequestDto.getPage(), coinRequestDto.getLimit());
@@ -407,9 +408,10 @@ public class ItemDaoImpl implements ItemDao {
     }
 
     @Override
-    public boolean updateOnSale(long itemId) {
+    public boolean updateOnSale(long itemId, int state) {
         Item item = new Item();
         item.setIsOnSale(false);
+        item.setState(state);
         item.setId(itemId);
         return updateById(item) > 0;
     }

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

@@ -2,6 +2,7 @@ package com.wwdz.ch.wx.impl;
 
 import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.core.consts.ConsignSaleEnum;
+import com.wwdz.ch.core.consts.ItemStateEnum;
 import com.wwdz.ch.core.entity.ConsignSaleVo;
 import com.wwdz.ch.core.type.PageSearchResult;
 import com.wwdz.ch.core.type.Result;
@@ -161,13 +162,19 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
     @Override
     public Result customCancel(ConsignSaleRequestDto dto) {
         try {
+            //检测该寄售单是否已完成，已完成不能取消
+            ConsignSale consignSaleInfo = consignSaleDao.findById(dto.getSaleId());
+            if (consignSaleInfo.getSystemState().intValue() == ConsignSaleEnum.SaleForSysStateEnum.FINISH.getCode()) {
+                return Result.failed("该寄售单已完成不能取消");
+            }
+
             ConsignSale consignSale = new ConsignSale();
             consignSale.setSaleId(dto.getSaleId());
             consignSale.setCustomState(ConsignSaleEnum.SaleForUserStateEnum.CANCEL.getCode());
             consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode());
             consignSaleDao.update(consignSale);
             //商品下架
-            itemDao.updateOnSale(dto.getItemId());
+            itemDao.updateOnSale(dto.getItemId(), ItemStateEnum.SHELVE.getCode());
 
             //插入操作记录
             ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();

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

@@ -491,6 +491,7 @@ public class ItemServiceImpl implements ItemService {
             CoinRequestDto coinRequestDto = new CoinRequestDto();
             coinRequestDto.setUserId(dto.getUserId());
             coinRequestDto.setIsOnSale(false);
+            coinRequestDto.setState(ItemStateEnum.SALED.getCode());
             coinRequestDto.setPage(dto.getPage());
             coinRequestDto.setLimit(dto.getSize());
             List<Item> itemList = itemDao.findListByPageForSale(coinRequestDto);