zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zcc'

Browse Source
This commit is contained in:
wangjinlei
2024-11-01 18:30:13 +08:00
parent 214b267a11 9022ac2b07
commit 3190a2abbc
6 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

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

3
src/main/java/com/peanut/modules/common/dao/CouponToProductDao.java
View File

@@ -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> {
}

3
src/main/java/com/peanut/modules/common/service/CouponService.java
View File

@@ -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);
}

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

@@ -237,13 +237,20 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
}
@Override
public void insertCouponHistoryByProductId(List<Integer> productIds) {
List<CouponToProduct> couponToProductList = couponToProductDao.selectList(new LambdaQueryWrapper<CouponToProduct>()
.in(CouponToProduct::getProductId,productIds));
for (CouponToProduct couponToProduct : couponToProductList) {
ShopProduct shopProduct = shopProductDao.selectById(couponToProduct.getProductId());
insertCouponHistory(couponToProduct.getCouponId(),
ShiroUtils.getUId(), 1,"购买商品"+shopProduct.getProductName()+"赠送");
public void insertCouponHistoryByProductId(BuyOrder order) {
MPJLambdaWrapper<CouponToProduct> wrapper = new MPJLambdaWrapper();
wrapper.leftJoin(BuyOrderProduct.class,BuyOrderProduct::getProductId,CouponToProduct::getProductId);
wrapper.eq(BuyOrderProduct::getOrderId,order.getOrderId());
wrapper.select(CouponToProduct::getCouponId);
wrapper.select(BuyOrderProduct::getProductId);
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()+"赠送");
}
}

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

@@ -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());

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

@@ -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());