Merge remote-tracking branch 'origin/zcc'

This commit is contained in:
wangjinlei
2024-11-01 19:04:22 +08:00

View File

@@ -246,9 +246,9 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
wrapper.select(BuyOrderProduct::getQuantity); wrapper.select(BuyOrderProduct::getQuantity);
List<Map<String,Object>> buyOrderProducts = couponToProductDao.selectJoinMaps(wrapper); List<Map<String,Object>> buyOrderProducts = couponToProductDao.selectJoinMaps(wrapper);
for (Map<String,Object> map : buyOrderProducts) { for (Map<String,Object> map : buyOrderProducts) {
ShopProduct shopProduct = shopProductDao.selectById(map.get("productId").toString()); ShopProduct shopProduct = shopProductDao.selectById(map.get("product_id").toString());
for (int i=0;i<Integer.parseInt(map.get("quantity").toString());i++){ for (int i=0;i<Integer.parseInt(map.get("quantity").toString());i++){
insertCouponHistory(Integer.parseInt(map.get("couponId").toString()), insertCouponHistory(Integer.parseInt(map.get("coupon_id").toString()),
ShiroUtils.getUId(), 1,"购买商品"+shopProduct.getProductName()+"赠送"); ShiroUtils.getUId(), 1,"购买商品"+shopProduct.getProductName()+"赠送");
} }
} }