Merge remote-tracking branch 'origin/zcc'

src/main/java/com/peanut/modules/book/controller/BuyOrderController.java

@@ -336,10 +336,7 @@ public class BuyOrderController {
                     couponService.useCouponAmount(couponHistory);
                 }
                 //发放优惠卷
-                List<Integer> collect = buyOrderProductService.list(new LambdaQueryWrapper<BuyOrderProduct>()
+                couponService.insertCouponHistoryByProductId(buyOrder);
-                        .eq(BuyOrderProduct::getOrderId, buyOrder.getOrderId()))
-                        .stream().map(BuyOrderProduct::getProductId).collect(Collectors.toList());
-                couponService.insertCouponHistoryByProductId(collect);
             } else {
                 return R.error(500, "天医币余额不足！");
             }

src/main/java/com/peanut/modules/common/dao/CouponToProductDao.java

@@ -1,9 +1,10 @@
 package com.peanut.modules.common.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import com.peanut.modules.common.entity.CouponToProduct;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface CouponToProductDao extends BaseMapper<CouponToProduct> {
+public interface CouponToProductDao extends MPJBaseMapper<CouponToProduct> {
 }

src/main/java/com/peanut/modules/common/service/CouponService.java

@@ -2,6 +2,7 @@ package com.peanut.modules.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.R;
+import com.peanut.modules.common.entity.BuyOrder;
 import com.peanut.modules.common.entity.CouponEntity;
 import com.peanut.modules.common.entity.CouponHistory;
 import java.math.BigDecimal;
@@ -28,6 +29,6 @@ public interface CouponService extends IService<CouponEntity> {
     void rollbackCoupon(int couponHistoryId);
 
     //通过商品发放优惠卷
-    void insertCouponHistoryByProductId(List<Integer> productIds);
+    void insertCouponHistoryByProductId(BuyOrder order);
 
 }

src/main/java/com/peanut/modules/common/service/impl/CouponServiceImpl.java

@@ -237,13 +237,20 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
     }
 
     @Override
-    public void insertCouponHistoryByProductId(List<Integer> productIds) {
+    public void insertCouponHistoryByProductId(BuyOrder order) {
-        List<CouponToProduct> couponToProductList = couponToProductDao.selectList(new LambdaQueryWrapper<CouponToProduct>()
+        MPJLambdaWrapper<CouponToProduct> wrapper = new MPJLambdaWrapper();
-                .in(CouponToProduct::getProductId,productIds));
+        wrapper.leftJoin(BuyOrderProduct.class,BuyOrderProduct::getProductId,CouponToProduct::getProductId);
-        for (CouponToProduct couponToProduct : couponToProductList) {
+        wrapper.eq(BuyOrderProduct::getOrderId,order.getOrderId());
-            ShopProduct shopProduct = shopProductDao.selectById(couponToProduct.getProductId());
+        wrapper.select(CouponToProduct::getCouponId);
-            insertCouponHistory(couponToProduct.getCouponId(),
+        wrapper.select(BuyOrderProduct::getProductId);
-                    ShiroUtils.getUId(), 1,"购买商品"+shopProduct.getProductName()+"赠送");
+        wrapper.select(BuyOrderProduct::getQuantity);
+        List<Map<String,Object>> buyOrderProducts = couponToProductDao.selectJoinMaps(wrapper);
+        for (Map<String,Object> map : buyOrderProducts) {
+            ShopProduct shopProduct = shopProductDao.selectById(map.get("productId").toString());
+            for (int i=0;i<Integer.parseInt(map.get("quantity").toString());i++){
+                insertCouponHistory(Integer.parseInt(map.get("couponId").toString()),
+                        ShiroUtils.getUId(), 1,"购买商品"+shopProduct.getProductName()+"赠送");
+            }
         }
 
 

src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java

@@ -289,10 +289,10 @@ public class AliPayServiceImpl  implements AliPayService {
                             }
                         }
                         //开通course，end
+                        //发放优惠卷
+                        couponService.insertCouponHistoryByProductId(order);
 
                         List<Integer> collect = buyOrderProductDao.selectList(new LambdaQueryWrapper<BuyOrderProduct>().eq(BuyOrderProduct::getOrderId, order.getOrderId())).stream().map(BuyOrderProduct::getProductId).collect(Collectors.toList());
-                        //发放优惠卷
-                        couponService.insertCouponHistoryByProductId(collect);
                         //手摸脚模购买后会开启用户的脉穴的功能
                         if(collect.contains(128)||collect.contains(129)||collect.contains(130)||collect.contains(131)||collect.contains(136)||collect.contains(137)){
                             MyUserEntity userInfo = userService.getById(order.getUserId());

src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java

@@ -235,10 +235,9 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
                 }
             }
             //开通course，end
-
-            List<Integer> collect = buyOrderProductDao.selectList(new LambdaQueryWrapper<BuyOrderProduct>().eq(BuyOrderProduct::getOrderId, order.getOrderId())).stream().map(BuyOrderProduct::getProductId).collect(Collectors.toList());
             //发放优惠卷
-            couponService.insertCouponHistoryByProductId(collect);
+            couponService.insertCouponHistoryByProductId(order);
+            List<Integer> collect = buyOrderProductDao.selectList(new LambdaQueryWrapper<BuyOrderProduct>().eq(BuyOrderProduct::getOrderId, order.getOrderId())).stream().map(BuyOrderProduct::getProductId).collect(Collectors.toList());
             //手摸脚模购买后会开启用户的脉穴的功能
             if(collect.contains(128)||collect.contains(129)||collect.contains(130)||collect.contains(131)||collect.contains(136)||collect.contains(137)){
                 MyUserEntity userInfo = userService.getById(order.getUserId());