Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

2024-12-12 09:07:02 +08:00
parent 0ac6ab33d5 b950d03dae
commit 0865cd5290
3 changed files with 3 additions and 1 deletions
--- a/src/main/java/com/peanut/modules/common/service/impl/CouponServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/CouponServiceImpl.java
@@ -251,7 +251,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
            ShopProduct shopProduct = shopProductDao.selectById(map.get("product_id").toString());
            for (int i=0;i<Integer.parseInt(map.get("quantity").toString());i++){
                insertCouponHistory(Integer.parseInt(map.get("coupon_id").toString()),
-                        ShiroUtils.getUId(), 1,"购买商品"+shopProduct.getProductName()+"赠送");
+                        order.getUserId(), 1,"购买商品"+shopProduct.getProductName()+"赠送");
            }
        }