盲袋优惠活动可配置

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

@@ -9,13 +9,16 @@ import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.core.util.StringUtil;
 import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
 import com.wwdz.ch.db.dao.distribution.ItemSkuDao;
+import com.wwdz.ch.db.dao.distribution.SellActivityDao;
 import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.distribution.DistributionOrder;
 import com.wwdz.ch.db.domain.distribution.ItemSku;
+import com.wwdz.ch.db.domain.distribution.SellActivity;
 import com.wwdz.ch.db.domain.distribution.SupplierItem;
 import com.wwdz.ch.db.dto.request.distribution.ItemSkuRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.SellActivityRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
 import com.wwdz.ch.wx.entity.vo.distribution.*;
 import com.wwdz.ch.wx.service.distribution.BlindBoxService;
@@ -46,6 +49,9 @@ public class BlindBoxServiceImpl implements BlindBoxService {
     @Autowired
     CacheUtil cacheUtil;
 
+    @Autowired
+    SellActivityDao sellActivityDao;
+
     @Override
     public Result findForHomePage(SupplierItemRequestDto dto) {
         try {
@@ -68,7 +74,11 @@ public class BlindBoxServiceImpl implements BlindBoxService {
                 itemList.add(imageList);
             }
             BlindBoxVo blindBoxVo = new BlindBoxVo();
-            blindBoxVo.setSellActivity("全场限时立减5元");
+            SellActivityRequestDto sellActivityRequestDto = new SellActivityRequestDto();
+            List<SellActivity> sellActivityList = sellActivityDao.findList(sellActivityRequestDto);
+            if (!CollectionUtils.isEmpty(sellActivityList)) {
+                blindBoxVo.setSellActivity(sellActivityList.get(0).getName());
+            }
             blindBoxVo.setItemList(itemList);
             return Result.success(blindBoxVo);
         } catch (Exception e) {
@@ -103,7 +113,7 @@ public class BlindBoxServiceImpl implements BlindBoxService {
                 blindBoxInfoVo.setName(supplierItem.getName());
                 blindBoxInfoVo.setPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
                 blindBoxInfoVo.setTotalNum(pageInfo.getTotal());
-                blindBoxInfoVo.setRemainNum(supplierItem.getStock().longValue());
+                blindBoxInfoVo.setRemainNum(supplierItem.getStock().longValue() < 0 ? 0 : supplierItem.getStock().longValue());
                 //查询购买记录
                 List<DistributionOrder> distributionOrderList = distributionOrderDao.findBuyRecordByItemId(itemId);
                 if (!CollectionUtils.isEmpty(distributionOrderList)) {
@@ -129,7 +139,11 @@ public class BlindBoxServiceImpl implements BlindBoxService {
             }
             Map<String, Object> map = new HashMap<>();
             map.put("data", blindBoxInfoVoList);
-            map.put("sellActivity", "全场限时立减5元");
+            SellActivityRequestDto sellActivityRequestDto = new SellActivityRequestDto();
+            List<SellActivity> sellActivityList = sellActivityDao.findList(sellActivityRequestDto);
+            if (!CollectionUtils.isEmpty(sellActivityList)) {
+                map.put("sellActivity", sellActivityList.get(0).getName());
+            }
             map.put("backgroundImage", "");
             return Result.success(map);
         } catch (Exception e) {
@@ -166,7 +180,7 @@ public class BlindBoxServiceImpl implements BlindBoxService {
             blindBoxDetailVo.setName(supplierItem.getName());
             blindBoxDetailVo.setPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
             blindBoxDetailVo.setTotalNum(pageInfo.getTotal());
-            blindBoxDetailVo.setRemainNum(supplierItem.getStock().longValue());
+            blindBoxDetailVo.setRemainNum(supplierItem.getStock().longValue() < 0 ? 0 : supplierItem.getStock().longValue());
 
             //查询购买记录
             //盲袋的编码