银收客 模板消息修改

cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java

@@ -15,8 +15,8 @@ import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import com.czg.task.DistributionTask;
 import com.czg.utils.AssertUtil;
-import com.czg.utils.FunUtils;
 import com.mybatisflex.core.paginate.Page;
+import io.seata.core.exception.TransactionException;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.NestedExceptionUtils;
@@ -46,7 +46,7 @@ public class UDistributionController {
     private DistributionTask distributionTask;
 
     /**
-     * 分销员中心-获取配置
+     * 测试方法-分销流水入账
      */
     @GetMapping("/task")
     public CzgResult<String> task(@RequestParam Long shopId) {
@@ -137,11 +137,12 @@ public class UDistributionController {
      * 分销员中心-无感-绑定邀请人
      */
     @PostMapping("/autoBindInviteUser")
-    public CzgResult<Map<String, Object>> autoBindInviteUser(@RequestBody MkDistributionUserDTO param) {
-        AssertUtil.isNull(param.getId(), "店铺用户ID不能为空");
-        AssertUtil.isNull(param.getShopId(), "店铺ID不能为空");
-        AssertUtil.isNull(param.getInviteCode(), "邀请码不能为空");
-        FunUtils.asyncSafeRunVoid(() -> distributionUserService.bindInviteUser(param), "无感绑定上级");
+    public CzgResult<Map<String, Object>> autoBindInviteUser(@RequestBody MkDistributionUserDTO param) throws TransactionException {
+        try {
+            bindInviteUser(param);
+        } catch (Exception e) {
+            log.error("无感绑定邀请人失败：{}", param, e);
+        }
         return CzgResult.success();
     }
 

cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java

@@ -79,7 +79,7 @@ public class UPpPackageController {
      * 取消订单
      */
     @GetMapping("/cancel")
-    public CzgResult<Boolean> cancelOrder(Long orderId) {
+    public CzgResult<Boolean> cancelOrder(@RequestParam Long orderId) {
         return CzgResult.success(ppPackageOrderService.cancelOrder(orderId));
     }
 
@@ -95,7 +95,7 @@ public class UPpPackageController {
      * 获取订单详情
      */
     @GetMapping("/order/detail")
-    public CzgResult<PpPackageOrderDTO> getOrderDetail(Long orderId) {
+    public CzgResult<PpPackageOrderDTO> getOrderDetail(@RequestParam Long orderId) {
         return CzgResult.success(ppPackageOrderService.getOrderDetailById(orderId, StpKit.USER.getLoginIdAsLong()));
     }
 

cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java

@@ -1,8 +1,11 @@
 package com.czg.controller.user;
 
+import com.czg.market.entity.MkPointsGoods;
 import com.czg.market.entity.MkPointsGoodsRecord;
+import com.czg.market.entity.ShopCoupon;
 import com.czg.market.service.MkPointsGoodsRecordService;
 import com.czg.market.service.MkPointsGoodsService;
+import com.czg.market.service.ShopCouponService;
 import com.czg.order.dto.CommonRefundDTO;
 import com.czg.order.dto.LtPayOtherDTO;
 import com.czg.order.service.PointsGoodPayService;
@@ -34,6 +37,8 @@ public class UPointGoodsController {
     private MkPointsGoodsRecordService goodsRecordService;
     @Resource
     private PointsGoodPayService goodPayService;
+    @Resource
+    private ShopCouponService shopCouponService;
 
     /**
      * 商品列表
@@ -51,6 +56,22 @@ public class UPointGoodsController {
         return CzgResult.success(data);
     }
 
+    /**
+     * 商品详情
+     */
+    @GetMapping("/{id}")
+    public CzgResult<MkPointsGoods> getPointsGoodsSettingById(@PathVariable("id") Long id) {
+        MkPointsGoods goods = pointsGoodsService.getById(id);
+        if ("优惠券".equals(goods.getGoodsCategory())) {
+            ShopCoupon one = shopCouponService.getOne(QueryWrapper.create().eq(ShopCoupon::getId, goods.getCouponId())
+                    .eq(ShopCoupon::getShopId, goods.getShopId())
+                    .eq(ShopCoupon::getStatus, 1)
+                    .eq(ShopCoupon::getIsDel, 0));
+            goods.setCouponInfo(one);
+        }
+        return CzgResult.success(goods);
+    }
+
     /**
      * 生成订单
      * 小程序支付

cash-api/product-server/src/main/resources/application.yml

@@ -21,7 +21,7 @@ wx:
     appId: wx212769170d2c6b2a
     secrete: 8492a7e8d55bbb1b57f5c8276ea1add0
     operationMsgTmpId: wFdoUG-dUT7bDRHq8bMJD9CF5TjyH9x_uJQgQByZqHg
-    warnMsgTmpId: C08OUr80x6wGmUN1zpFhSQ3Sv7VF5vksdZigiEx2pD0
+    warnMsgTmpId: C08OUr80x6wGmUN1zpFhSZyFA2G6b9_jiZgEppzLB70
 
 
 

cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java

@@ -43,7 +43,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
         userConfig.setIsShare(true);
 //        config2.setTimeout(2000);
         userConfig.setTokenStyle("simple-uuid");
-        MyStpLogic.CLIENT_LOGIC.setConfig(userConfig);
+        MyStpLogic.USER_LOGIC.setConfig(userConfig);
     }
 
     @PostConstruct
@@ -62,21 +62,25 @@ public class SaTokenConfigure implements WebMvcConfigurer {
             // 重置根路径，防止satoken切割根路径导致匹配不到路径
             ApplicationInfo.routePrefix = "";
 
-            SaRouter.match("/user/**").notMatch("/user/login", "/user/test", "/user/geo/**", "/user/home/**", "/user/home/**", "/user/dict/**", "/user/openId")
-                    .notMatch("/pay/**")
-                    .notMatch("/notify/**")
-                    .check(r -> MyStpLogic.CLIENT_LOGIC.checkLogin())
-                    .setHit(true)
-//                    .match("/**")
-                    .notMatch("/user/**")
-                    .notMatch("/pay/**")
-                    .notMatch("/notify/**")
-                    .notMatch("/admin/auth/**")
-                    .notMatch("/admin/shopMsgPush/subscribe/**")
-                    .notMatch("/admin/coupon/grant")
+            SaRouter
+                    // 完全开放的路径（不需要任何认证）
+                    .match("/user/login", "/user/geo/**", "/user/home/**",
+                            "/user/dict/**", "/user/openId","/admin/auth/**",
+                            "/admin/shopMsgPush/subscribe/**",
+                            "/admin/coupon/grant",
+                            "/pay/**",
+                            "/notify/**")
+                    .stop()  // 直接放行，不检查登录
+
+                    // 用户认证路径
+                    .match("/user/**")
+                    .check(r -> MyStpLogic.USER_LOGIC.checkLogin())
+
+                    // 管理端认证（内网IP免认证）
+                    .match("/**")
                     .check(r -> {
-                        ServletRequestAttributes attributes =
-                                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+                        ServletRequestAttributes attributes = (ServletRequestAttributes)
+                                RequestContextHolder.getRequestAttributes();
                         if (attributes == null || (!ServletUtil.getClientIP(attributes.getRequest()).contains("192.168") && !ServletUtil.getClientIP(attributes.getRequest()).contains("127.0.0.1"))) {
                             MyStpLogic.ADMIN_LOGIC.checkLogin();
                         }

cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java

@@ -27,7 +27,7 @@ import java.util.function.Consumer;
 @Slf4j
 @Getter
 public class MyStpLogic {
-    public static final StpLogic CLIENT_LOGIC = new StpLogic("client");
+    public static final StpLogic USER_LOGIC = new StpLogic("user");
     public static final StpLogic ADMIN_LOGIC = new StpLogic("admin");
 
     public Object isPC() {
@@ -42,7 +42,7 @@ public class MyStpLogic {
     private StpLogic getLogic() {
         boolean hit = SaRouter.match("/user/**").isHit();
         if (hit) {
-            return CLIENT_LOGIC;
+            return USER_LOGIC;
         }
         return ADMIN_LOGIC;
     }

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java

@@ -152,6 +152,23 @@ public class ShopUser implements Serializable {
     private LocalDateTime nextDeliverTime;
     // 是否分销员
     private String distributionShops;
+    /**
+     * 上级分销员id
+     */
+    private Long parentUserId;
+    /**
+     * 上上级分销员id
+     */
+    private Long gradeUserId;
+    /**
+     * 一级分销收入
+     */
+    private BigDecimal oneIncome;
+    /**
+     * 二级分销收入
+     */
+    private BigDecimal twoIncome;
+
     private String memberCircleName;
     private Integer memberCircleReward;
 

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java

@@ -2,6 +2,7 @@ package com.czg.account.service;
 
 import com.czg.account.entity.ShopConfig;
 import com.czg.account.entity.ShopInfo;
+import com.czg.exception.CzgException;
 import com.mybatisflex.core.service.IService;
 
 import java.io.Serializable;
@@ -15,7 +16,7 @@ import java.util.List;
  */
 public interface ShopConfigService extends IService<ShopConfig> {
 
-    ShopInfo getShopInfoAndConfig(Serializable id);
+    ShopInfo getShopInfoAndConfig(Serializable id) throws CzgException;
 
     void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, String name, String useShopType, List<Long> shopIdList);
 

cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionFlow.java

@@ -110,8 +110,10 @@ public class MkDistributionFlow implements Serializable {
 
     private String nickName;
 
+    /**
+     * 分成比例
+     */
     private BigDecimal commission;
-    private BigDecimal parentCommission;
     private LocalDateTime deliverTime;
     private Long userId;
 }

cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionLevelConfig.java

@@ -62,12 +62,8 @@ public class MkDistributionLevelConfig implements Serializable {
     /**
      * 一级分销比例
      */
-    private BigDecimal levelOneCommission;
+    private BigDecimal commission;
 
-    /**
-     * 二级分销比例
-     */
-    private BigDecimal levelTwoCommission;
 
     /**
      * 创建时间

cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopUserInvite.java

@@ -1,74 +0,0 @@
-package com.czg.market.entity;
-
-import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
-import com.mybatisflex.annotation.Table;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-import java.io.Serial;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 邀请与上级关联表 实体类。
- *
- * @author ww
- * @since 2025-11-06
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Table("tb_shop_user_invite")
-public class ShopUserInvite implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * (随机)
-     */
-    @Id(keyType = KeyType.Auto)
-    private Long id;
-
-    /**
-     * 店铺ID
-     */
-    private Long shopId;
-
-    /**
-     * 店铺用户ID
-     */
-    private Long shopUserId;
-
-    /**
-     * 邀请人ID mk_distribution_user.id
-     */
-    private Long distributionUserId;
-
-    /**
-     * 邀请人上级ID mk_distribution_user.id
-     */
-    private Long distributionUserParentId;
-
-    /**
-     * 邀请人收益/一级分润
-     */
-    private BigDecimal oneIncome;
-
-    /**
-     * 邀请人上级收益/二级分润
-     */
-    private BigDecimal twoIncome;
-
-    /**
-     * 邀请时间
-     */
-    private LocalDateTime inviteTime;
-
-}

cash-common/cash-common-service/src/main/java/com/czg/market/service/ShopUserInviteService.java

@@ -1,22 +0,0 @@
-package com.czg.market.service;
-
-import com.mybatisflex.core.service.IService;
-import com.czg.market.entity.ShopUserInvite;
-
-/**
- * 邀请与上级关联表 服务层。
- *
- * @author ww
- * @since 2025-11-06
- */
-public interface ShopUserInviteService extends IService<ShopUserInvite> {
-
-    /**
-     * 根据店铺ID和店铺用户ID查询邀请记录
-     *
-     * @param shopId     店铺ID
-     * @param shopUserId 店铺用户ID
-     * @return 邀请记录
-     */
-    ShopUserInvite getOneByShopIdAndShopUserId(Long shopId, Long shopUserId);
-}

cash-common/cash-common-tools/src/main/java/com/czg/utils/FunUtils.java

@@ -52,7 +52,6 @@ public class FunUtils {
 
     /**
      * 在事务提交后执行方法
-     * 异步 执行
      *
      * @param func 方法
      */

cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml

@@ -18,7 +18,7 @@
           and amount - #{money} >= 0
     </update>
     <update id="updateOneOrTwoAmount">
-        update tb_shop_user_invite
+        update tb_shop_user
         <set>
             <if test="isOne != null and isOne == 1">
                 one_income = one_income + #{amount}
@@ -27,8 +27,7 @@
                 two_income = two_income + #{amount}
             </if>
         </set>
-        where shop_user_id = #{shopUserId}
-        and shop_id = #{shopId}
+        where id = #{shopUserId}
     </update>
 
 
@@ -257,10 +256,10 @@
     </select>
     <select id="getInviteUser" resultType="com.czg.market.vo.InviteUserVO">
         SELECT
-        u.id AS shopUserId,
-        u.head_img AS headImg,
-        u.nick_name AS shopUserName,
-        u.phone AS shopUserPhone,
+        invite.id AS shopUserId,
+        invite.head_img AS headImg,
+        invite.nick_name AS shopUserName,
+        invite.phone AS shopUserPhone,
         invite.one_income AS oneIncome,
         invite.invite_time AS inviteTime,
         dist.total_income AS totalIncome,
@@ -270,13 +269,12 @@
         dist.status AS status,
         dist.distribution_level_id AS levelId,
         dist.distribution_level_name AS levelName,
-        u.distribution_shops AS distributionShops
-        FROM tb_shop_user_invite invite
-        left join tb_shop_user u on invite.shop_user_id = u.id
-        left join mk_distribution_user dist on u.id = dist.id and dist.shop_id = #{shopId}
-        WHERE invite.`distribution_user_id` = #{distributionUserId} and invite.shop_id = #{shopId}
+        invite.distribution_shops AS distributionShops
+        FROM tb_shop_user invite
+        left join mk_distribution_user dist on invite.id = dist.id and dist.shop_id = #{shopId}
+        WHERE invite.`parent_user_id` = #{distributionUserId}
         <if test="distributionLevelId != null">and dist.distribution_level_id = #{distributionLevelId}</if>
-        <if test="shopUserId != null">and invite.shop_user_id = #{shopUserId}</if>
+        <if test="shopUserId != null">and invite.id = #{shopUserId}</if>
         ORDER BY invite.`invite_time` DESC
     </select>
 </mapper>

cash-service/market-service/src/main/java/com/czg/service/market/mapper/ShopUserInviteMapper.java

@@ -1,14 +0,0 @@
-package com.czg.service.market.mapper;
-
-import com.mybatisflex.core.BaseMapper;
-import com.czg.market.entity.ShopUserInvite;
-
-/**
- * 邀请与上级关联表 映射层。
- *
- * @author ww
- * @since 2025-11-06
- */
-public interface ShopUserInviteMapper extends BaseMapper<ShopUserInvite> {
-
-}

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java

@@ -73,12 +73,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
     private MkDistributionWithdrawFlowService withdrawFlowService;
     @Resource
     private MkDistributionDeliverService distributionDeliverService;
-    @Resource
-    private ShopUserInviteService shopUserInviteService;
-
     @Resource
     private AppWxServiceImpl appWxService;
-
     @DubboReference
     private ShopUserService shopUserService;
     @DubboReference
@@ -150,9 +146,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
         AssertUtil.isNull(shopUser, "店铺用户不存在");
         UserInfo userInfo = userInfoService.getById(shopUser.getUserId());
         result.put("cashOutAmount", userInfo.getDistributionAmount() == null ? 0.0 : userInfo.getDistributionAmount());
-        ShopUserInvite shopUserInvite = shopUserInviteService.getOneByShopIdAndShopUserId(shopId, shopUser.getId());
-        if (shopUserInvite != null && shopUserInvite.getDistributionUserId() != null) {
-            MkDistributionUser mkDistributionUser = getMkDistributionUserByIdAndShopId(shopUserInvite.getDistributionUserId(), shopId);
+
+        if (shopUser.getParentUserId() != null) {
+            MkDistributionUser mkDistributionUser = getMkDistributionUserByIdAndShopId(shopUser.getParentUserId(), shopId);
             AssertUtil.isNull(mkDistributionUser, "上级分销员不存在");
             ShopUser shopUserParent = shopUserService.getById(mkDistributionUser.getId());
             result.put("parentName", shopUserParent.getNickName());
@@ -181,7 +177,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
                     if (levelConfig.getId().equals(mkDistributionUser.getDistributionLevelId())) {
                         distributionUser.put("level", levelConfig.getLevel());
                         distributionUser.put("levelName", levelConfig.getName());
-                        distributionUser.put("levelOneCommission", levelConfig.getLevelOneCommission());
+                        distributionUser.put("levelOneCommission", levelConfig.getCommission());
                         isNextLevel = true;
                     }
                 }
@@ -234,8 +230,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
     public void bindInviteUser(MkDistributionUserDTO param) throws CzgException, ValidateException {
         ShopUser shopUser = shopUserService.getById(param.getId());
         AssertUtil.isNull(shopUser, "店铺用户不存在");
-        ShopUserInvite shopUserInvite = shopUserInviteService.getOneByShopIdAndShopUserId(param.getShopId(), shopUser.getId());
-        if (shopUserInvite != null && shopUserInvite.getDistributionUserId() != null) {
+        if (shopUser.getParentUserId() != null) {
             throw new CzgException("店铺用户已绑定分销员");
         }
         MkDistributionUser parent = getOne(QueryWrapper.create().eq(MkDistributionUser::getInviteCode, param.getInviteCode()));
@@ -251,26 +246,28 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
         }
         ShopUser parentShopUser = shopUserService.getById(parent.getId());
         AssertUtil.isNull(parentShopUser, "邀请人不存在");
-        ShopUserInvite parentShopUserInvite = shopUserInviteService.getOneByShopIdAndShopUserId(param.getShopId(), parentShopUser.getId());
-        if (parentShopUserInvite != null && parentShopUserInvite.getDistributionUserId() != null && parentShopUserInvite.getDistributionUserId().equals(shopUser.getId())) {
+
+        if (parentShopUser.getParentUserId() != null && parentShopUser.getParentUserId().equals(shopUser.getId())) {
             throw new CzgException("存在绑定关系，不可绑定");
         }
-        if (parentShopUserInvite != null && parentShopUserInvite.getDistributionUserParentId() != null && parentShopUserInvite.getDistributionUserParentId().equals(shopUser.getId())) {
+        if (parentShopUser.getGradeUserId() != null && parentShopUser.getGradeUserId().equals(shopUser.getId())) {
             throw new CzgException("存在绑定关系，不可绑定");
         }
         //更新自己的上级
-        ShopUserInvite newShopUserInvite = new ShopUserInvite();
-        newShopUserInvite.setShopId(param.getShopId());
-        newShopUserInvite.setShopUserId(shopUser.getId());
-        newShopUserInvite.setDistributionUserId(parentShopUser.getId());
-        newShopUserInvite.setDistributionUserParentId(parentShopUserInvite == null ? null : parentShopUserInvite.getDistributionUserParentId());
-        newShopUserInvite.setInviteTime(LocalDateTime.now());
-        shopUserInviteService.save(newShopUserInvite);
-        if (parentShopUserInvite != null && parentShopUserInvite.getDistributionUserParentId() != null) {
+        shopUser.setParentUserId(parentShopUser.getId());
+        shopUser.setGradeUserId(parentShopUser.getParentUserId());
+
+        //更新自己的下级 的上级的上级 为自己的上级
+        ShopUser upShopUser1 = new ShopUser();
+        upShopUser1.setParentUserId(parentShopUser.getId());
+        upShopUser1.setGradeUserId(parentShopUser.getParentUserId());
+        shopUserService.update(upShopUser1, QueryWrapper.create().eq(ShopUser::getId, shopUser.getId()));
+
+        if (shopUser.getParentUserId() != null) {
             //更新自己的下级 的上级的上级 为自己的上级
-            ShopUserInvite childShopUserInvite = new ShopUserInvite();
-            childShopUserInvite.setDistributionUserParentId(parentShopUser.getId());
-            shopUserInviteService.update(childShopUserInvite, QueryWrapper.create().eq(ShopUserInvite::getDistributionUserId, shopUser.getId()));
+            ShopUser upShopUser = new ShopUser();
+            upShopUser.setGradeUserId(shopUser.getParentUserId());
+            shopUserService.update(upShopUser, QueryWrapper.create().eq(ShopUser::getParentUserId, shopUser.getId()));
         }
 
         MkDistributionUser newDistributionUser = new MkDistributionUser();
@@ -318,9 +315,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
     public void costUpgradeLevelBefore(Long userId, Long shopId) {
         ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId);
         costUpgradeLevel(shopUser.getId(), shopId);
-        ShopUserInvite shopUserInvite = shopUserInviteService.getOneByShopIdAndShopUserId(shopId, shopUser.getId());
-        if (shopUserInvite != null && shopUserInvite.getDistributionUserId() != null) {
-            costUpgradeLevel(shopUserInvite.getDistributionUserId(), shopId);
+        if (shopUser.getParentUserId() != null) {
+            costUpgradeLevel(shopUser.getParentUserId(), shopId);
         }
     }
 
@@ -569,70 +565,40 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
 
 
     @GlobalTransactional
-    protected void deepReward(ShopUser orderSourceShopUser, MkDistributionLevelConfig parentLevel, MkDistributionConfigVO config,
-                              MkDistributionUser currentDistributionUser, BigDecimal amount, Long sourceId, String type, String orderNo, Integer currentLevel) {
-        if (currentLevel > 2) {
-            return;
-        }
+    protected boolean deepReward(ShopUser orderSourceShopUser, BigDecimal commission, MkDistributionConfigVO config,
+                                 MkDistributionUser currentDistributionUser, BigDecimal amount, Long sourceId,
+                                 String type, String orderNo, Integer currentLevel) {
         // 当前分销员
         AssertUtil.isNull(currentDistributionUser, "分销员不存在");
         AssertUtil.isTrue(currentDistributionUser.getStatus() != 1, "分销员未开启");
-
-//        ShopUser currentShopUser = shopUserService.getById(currentDistributionUser.getId());
-        ShopUserInvite currentShopUser = shopUserInviteService.getOneByShopIdAndShopUserId(config.getShopId(), currentDistributionUser.getId());
-        MkDistributionLevelConfig level = levelConfigService.getById(currentDistributionUser.getDistributionLevelId());
-
-        // 校验剩余分成比例
-        BigDecimal finalCommission = parentLevel == null ? level.getLevelOneCommission() : level.getLevelOneCommission().subtract(parentLevel.getLevelOneCommission());
-        if (finalCommission.compareTo(BigDecimal.ZERO) <= 0) {
-            log.info("当前分销员: {}, 分销等级: {}, 剩余比例: {}, 不参与分销", currentDistributionUser.getId(), level.getId(), finalCommission);
-            return;
+        if (commission.compareTo(BigDecimal.ZERO) <= 0) {
+            return false;
         }
-
-        // 上上级分销员
-        if (currentShopUser != null && currentShopUser.getDistributionUserId() != null) {
-            MkDistributionUser parent = getMkDistributionUserByIdAndShopId(currentShopUser.getDistributionUserId(), config.getShopId());
-            try {
-                deepReward(orderSourceShopUser, level, config, parent, amount, sourceId, type, orderNo, currentLevel + 1);
-            } catch (Exception e) {
-                log.warn("分销奖励失败: {}", e.getMessage());
-            }
+        // 金额
+        BigDecimal rewardAmount = amount.multiply(commission.divide(BigDecimal.valueOf(100))).setScale(2, RoundingMode.FLOOR);
+        if (rewardAmount.compareTo(new BigDecimal("0.01")) < 0) {
+            return false;
         }
 
-        AssertUtil.isNull(level, "分销等级不存在");
-        log.info("当前分销员: {}, 上级分销员: {}, 分销等级: {}", currentDistributionUser.getId(), currentShopUser == null ? null : currentShopUser.getDistributionUserId(), level.getId());
-
         if (config.getRewardCount() != null && config.getRewardCount() > 0) {
             long count = distributionFlowService.count(new QueryWrapper()
                     .eq(MkDistributionFlow::getShopId, config.getShopId()).eq(MkDistributionFlow::getShopUserId, currentDistributionUser.getId()));
             if (count >= config.getRewardCount()) {
                 log.info("分销员{}已达到奖励次数上限, 次数: {}", currentDistributionUser.getId(), config.getRewardCount());
-                return;
-            } else {
-                log.info("分销员奖励次数: {}", count);
+                return false;
             }
         }
 
-        // 店铺信息
-        BigDecimal rewardAmount;
-//        if (currentLevel == 1) {
-//            rewardAmount = amount.multiply(level.getLevelOneCommission().divide(BigDecimal.valueOf(100), RoundingMode.DOWN));
-//        } else {
-//            rewardAmount = amount.multiply(level.getLevelTwoCommission().divide(BigDecimal.valueOf(100), RoundingMode.DOWN));
-//        }
-        rewardAmount = amount.multiply(finalCommission.divide(BigDecimal.valueOf(100), RoundingMode.DOWN));
-
         // 延时发放时间
         LocalDateTime delayTime = config.getSettlementDay() == null || config.getSettlementDay() == 0 ? null : DateUtil.offsetDay(DateUtil.date(), config.getSettlementDay()).toLocalDateTime();
-
         // 用户分账明细
         ShopUser shopUser = shopUserService.getById(currentDistributionUser.getId());
         MkDistributionFlow mkDistributionFlow = new MkDistributionFlow().setShopUserId(currentDistributionUser.getId())
                 .setShopId(currentDistributionUser.getShopId()).setDistributionUserId(currentDistributionUser.getId())
                 .setUserId(shopUser.getUserId())
                 .setNickName(shopUser.getNickName()).setSourceShopUserId(orderSourceShopUser.getId()).setSourceNickName(orderSourceShopUser.getNickName())
-                .setCommission(finalCommission).setParentCommission(parentLevel != null ? parentLevel.getLevelOneCommission() : null)
-                .setLevelId(currentDistributionUser.getDistributionLevelId()).setLevel(currentLevel == 1 ? 1 : 2).setOrderNo(orderNo)
+                .setCommission(commission)
+                .setLevelId(currentDistributionUser.getDistributionLevelId()).setLevel(currentLevel).setOrderNo(orderNo)
                 .setSourceId(sourceId).setAmount(amount).setType(type)
                 .setRewardAmount(rewardAmount).setBillNo(IdUtil.simpleUUID());
 
@@ -655,6 +621,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
             log.info("延时分销开始");
             updateIncome(rewardAmount, BigDecimal.ZERO, BigDecimal.ZERO, currentDistributionUser.getId(), shopUser.getUserId(), shopUser.getId(), config.getShopId(), currentLevel == 1 ? 1 : 2);
         }
+        return true;
     }
 
     @Override
@@ -712,19 +679,24 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
             AssertUtil.isTrue(amount.compareTo(BigDecimal.ZERO) == 0, "分销金额不能为0");
             MkDistributionConfigVO config = mkDistributionConfigService.detail(shopId);
             AssertUtil.isTrue(config.getIsEnable() != 1, "分销未开启");
-            // 当前用户上级分销员
-            ShopUser sourceShopUserInfo = shopUserService.getShopUserInfo(shopId, sourceUserId);
-            if (sourceShopUserInfo == null) {
+            // 产生消费的用户
+            ShopUser curUser = shopUserService.getShopUserInfo(shopId, sourceUserId);
+            if (curUser == null || curUser.getParentUserId() == null) {
                 return;
             }
-            ShopUserInvite sourceInviteUser = shopUserInviteService.getOneByShopIdAndShopUserId(shopId, sourceShopUserInfo.getId());
-            if (sourceInviteUser.getDistributionUserId() == null) {
-                return;
-            }
-            log.info("开始分销, 当前来源用户: {}, shopId: {}, 邀请人id: {}", sourceUserId, shopId, sourceInviteUser.getDistributionUserId());
 
-            MkDistributionUser distributionUser = getMkDistributionUserByIdAndShopId(sourceInviteUser.getDistributionUserId(), shopId);
-            deepReward(sourceShopUserInfo, null, config, distributionUser, amount, sourceId, type, orderNo, 1);
+            log.info("开始分销, 当前来源用户: {}, shopId: {}, 邀请人id: {}", sourceUserId, shopId, curUser.getParentUserId());
+
+            MkDistributionUser distributionUser = getMkDistributionUserByIdAndShopId(curUser.getParentUserId(), shopId);
+            MkDistributionLevelConfig level = levelConfigService.getById(distributionUser.getDistributionLevelId());
+            deepReward(curUser, level.getCommission(), config, distributionUser,
+                    amount, sourceId, type, orderNo, 1);
+            if (curUser.getGradeUserId() != null) {
+                MkDistributionUser parentDis = getMkDistributionUserByIdAndShopId(curUser.getGradeUserId(), shopId);
+                MkDistributionLevelConfig parentDisLevel = levelConfigService.getById(parentDis.getDistributionLevelId());
+                deepReward(curUser, parentDisLevel.getCommission().subtract(level.getCommission()), config, parentDis,
+                        amount, sourceId, type, orderNo, 2);
+            }
         });
         distributionDeliverService.save(deliver);
     }

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopUserInviteServiceImpl.java

@@ -1,25 +0,0 @@
-package com.czg.service.market.service.impl;
-
-import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
-import com.czg.market.entity.ShopUserInvite;
-import com.czg.market.service.ShopUserInviteService;
-import com.czg.service.market.mapper.ShopUserInviteMapper;
-import org.springframework.stereotype.Service;
-
-/**
- * 邀请与上级关联表 服务层实现。
- *
- * @author ww
- * @since 2025-11-06
- */
-@Service
-public class ShopUserInviteServiceImpl extends ServiceImpl<ShopUserInviteMapper, ShopUserInvite> implements ShopUserInviteService {
-
-    @Override
-    public ShopUserInvite getOneByShopIdAndShopUserId(Long shopId, Long shopUserId) {
-        return getOne(QueryWrapper.create()
-                .eq(ShopUserInvite::getShopId, shopId)
-                .eq(ShopUserInvite::getShopUserId, shopUserId));
-    }
-}

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java

@@ -296,6 +296,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
         }
         if (shopUser.getMemberLevelId() == null) {
             log.warn("会员等级不存在, 店铺id: {}, 用户id: {}", shopUser.getMainShopId(), shopUser.getUserId());
+            return false;
         }
         MemberConfigVO memberConfig = detail(shopUser.getMainShopId());
         if (memberConfig == null) {

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberLevelConfigServiceImpl.java

@@ -4,17 +4,15 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONArray;
 import com.czg.market.dto.MemberLevelDTO;
+import com.czg.market.entity.MemberLevelConfig;
+import com.czg.market.service.MemberLevelConfigService;
 import com.czg.market.service.ShopCouponService;
 import com.czg.market.vo.MemberLevelVO;
 import com.czg.service.market.mapper.TbMemberLevelConfigMapper;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
-import com.czg.market.entity.MemberLevelConfig;
-import com.czg.market.service.MemberLevelConfigService;
 import jakarta.annotation.Resource;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,20 +31,16 @@ public class TbMemberLevelConfigServiceImpl extends ServiceImpl<TbMemberLevelCon
     @Override
     public ArrayList<MemberLevelVO> listInfo(Long shopId) {
         List<MemberLevelConfig> levelConfigs = list(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopId));
-        ArrayList<MemberLevelVO> memberLevelVOS = new ArrayList<>();
-        levelConfigs.forEach(memberLevelConfig -> {
-            memberLevelVOS.add(transVO(memberLevelConfig));
-        });
-        return memberLevelVOS;
+        ArrayList<MemberLevelVO> memberLevels = new ArrayList<>();
+        levelConfigs.forEach(memberLevelConfig -> memberLevels.add(transVO(memberLevelConfig)));
+        return memberLevels;
     }
 
     private MemberLevelVO transVO(MemberLevelConfig memberLevelConfig) {
         MemberLevelVO levelVO = BeanUtil.copyProperties(memberLevelConfig, MemberLevelVO.class, "cycleRewardCouponList");
         if (StrUtil.isNotBlank(memberLevelConfig.getCycleRewardCouponList())) {
             List<MemberLevelDTO.ConfigCoupon> coupons = JSONArray.parseArray(memberLevelConfig.getCycleRewardCouponList()).toList(MemberLevelDTO.ConfigCoupon.class);
-            coupons.forEach(item -> {
-                item.setCoupon(shopCouponService.getById(item.getCoupon().getId()));
-            });
+            coupons.forEach(item -> item.setCoupon(shopCouponService.getById(item.getCoupon().getId())));
             levelVO.setCycleRewardCouponList(coupons);
         }
         return levelVO;
@@ -54,6 +48,7 @@ public class TbMemberLevelConfigServiceImpl extends ServiceImpl<TbMemberLevelCon
 
     @Override
     public MemberLevelVO detail(Long memberLevelId) {
+
         MemberLevelConfig memberLevelConfig = getById(memberLevelId);
         if (memberLevelConfig == null) {
             return null;

cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml

@@ -65,15 +65,13 @@
 
     <select id="getOrderConsumeAmountByList" resultType="java.math.BigDecimal">
         SELECT IFNULL(SUM(ord.pay_amount), 0) AS totalAmount
-        FROM tb_shop_user_invite invite
-                 INNER JOIN tb_shop_user su on invite.shop_user_id = su.id
-                 INNER JOIN tb_order_info ord ON su.user_id = ord.user_id
-            and invite.shop_id = #{shopId}
+        FROM tb_shop_user invite
+                 INNER JOIN tb_order_info ord ON invite.user_id = ord.user_id
             AND ord.shop_id = #{shopId}
             AND ord.STATUS = 'done'
             AND ord.pay_type NOT IN ('vip_pay', 'credit_pay')
             AND ord.paid_time >= invite.invite_time
-        WHERE invite.distribution_user_id = #{inviterId}
+        WHERE invite.parent_user_id = #{inviterId}
     </select>
 
     <select id="getOrderConsumeAmountById" resultType="java.math.BigDecimal">

cash-service/market-service/src/main/resources/mapper/ShopUserInviteMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.czg.service.market.mapper.ShopUserInviteMapper">
-
-</mapper>

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java

@@ -14,7 +14,6 @@ import com.czg.pay.PolyMerchantDTO;
 import com.czg.service.order.mapper.ShopMerchantMapper;
 import com.czg.service.order.service.ShopDirectMerchantService;
 import com.czg.utils.AssertUtil;
-import com.czg.utils.CzgStrUtils;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotBlank;
@@ -81,10 +80,12 @@ public class ShopMerchantServiceImpl extends ServiceImpl<ShopMerchantMapper, Sho
         }
         shopMerchant.setShopId(shopMerchantParam.getShopId());
         if (isUp) {
-            shopMerchant.setChannel(CzgStrUtils.getStrOrNull(shopMerchantParam.getChannel()));
+            if (StrUtil.isNotBlank(shopMerchantParam.getChannel())) {
+                shopMerchant.setChannel(shopMerchantParam.getChannel());
+            }
             shopMerchant.setRelatedId(shopMerchantParam.getRelatedId());
-            if (shopMerchantParam.getRelatedId() == null || !shopMerchantParam.getRelatedId().equals(shopMerchant.getRelatedId())) {
-                ShopDirectMerchant shopDirectMerchant = shopDirectMerchantService.getById(shopMerchantParam.getRelatedId());
+            if (shopMerchant.getRelatedId() != null && !shopMerchantParam.getRelatedId().equals(shopMerchant.getRelatedId())) {
+                ShopDirectMerchant shopDirectMerchant = shopDirectMerchantService.getById(shopMerchant.getRelatedId());
                 if (shopDirectMerchant != null) {
                     NativeMerchantDTO nativeMerchantDTO = new NativeMerchantDTO();
                     nativeMerchantDTO.setWechatMerchantId(shopDirectMerchant.getWechatMerchantId());

cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java

@@ -53,18 +53,6 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
     @Resource
     private WxAccountUtil wxAccountUtil;
 
-    private QueryWrapper buildQueryWrapper(ConsStockFlowDTO param) {
-        QueryWrapper queryWrapper = PageUtil.buildSortQueryWrapper();
-            /*if (StrUtil.isNotEmpty(param.getName())) {
-                queryWrapper.like(ConsStockFlow::getName, param.getName());
-            }*/
-        Long shopId = StpKit.USER.getShopId(0L);
-        queryWrapper.eq(ConsStockFlow::getShopId, shopId);
-        queryWrapper.orderBy(ConsStockFlow::getId, false);
-        return queryWrapper;
-    }
-
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ConsInOutStockHeadParam inStock(ConsInOutStockHeadParam param) {
@@ -72,7 +60,6 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
         Long createUserId = StpKit.USER.getLoginIdAsLong();
         String createUserName = StpKit.USER.getAccount();
         ConsStockFlow head = BeanUtil.copyProperties(param, ConsStockFlow.class);
-        List<ConsStockFlow> entityList = BeanUtil.copyToList(param.getBodyList(), ConsStockFlow.class);
         List<ConsStockFlow> insertList = new ArrayList<>();
         List<ConsInfo> updateStockList = new ArrayList<>();
         for (ConsInOutStockBodyParam entity : param.getBodyList()) {
@@ -251,15 +238,7 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
         Long shopId = entity.getShopId();
         BigDecimal afterNumber = entity.getAfterNumber();
         ConsInfo consInfo = consInfoMapper.selectOneById(entity.getConId());
-        String shopName = "";
-        try {
-            shopName = StpKit.USER.getShopName();
-        } catch (Exception e) {
-            log.error("获取店铺名称失败");
-        }
-        if (StrUtil.isEmpty(shopName)) {
-            shopName = productMapper.getShopName(shopId);
-        }
+        String shopName = productMapper.getShopName(shopId);
         BigDecimal conWarning = consInfo.getConWarning();
         // 库存小于警告值，发送消息提醒
         if (NumberUtil.isLess(afterNumber, conWarning)) {
@@ -268,12 +247,8 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
                 return;
             }
             String conName = StrUtil.format("{}数量<预警值{}", consInfo.getConName(), conWarning);
-            String finalShopName = shopName;
-            ThreadUtil.execAsync(() -> {
-                openIdList.parallelStream().forEach(openId -> {
-                    wxAccountUtil.sendStockMsg(finalShopName, conName, afterNumber, openId);
-                });
-            });
+            ThreadUtil.execAsync(() -> openIdList.parallelStream().forEach(openId ->
+                    wxAccountUtil.sendStockMsg("耗材库存预警", shopName, conName, afterNumber, openId)));
         }
     }
 }

cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductStockFlowServiceImpl.java

@@ -53,12 +53,8 @@ public class ProductStockFlowServiceImpl extends ServiceImpl<ProductStockFlowMap
             }
             String productName = StrUtil.sub(product.getName(), 0, 10).concat("...");
             String conName = StrUtil.format("{}数量<预警值{}", productName, warnLine);
-            String finalShopName = shopName;
-            ThreadUtil.execAsync(() -> {
-                openIdList.parallelStream().forEach(openId -> {
-                    wxAccountUtil.sendStockMsg(finalShopName, conName, afterNumber, openId);
-                });
-            });
+            ThreadUtil.execAsync(() -> openIdList.parallelStream().forEach(openId ->
+                    wxAccountUtil.sendStockMsg("商品库存预警", shopName, conName, afterNumber, openId)));
         }
     }
 }

cash-service/product-service/src/main/java/com/czg/service/product/util/WxAccountUtil.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.czg.exception.CzgException;
 import com.czg.service.RedisService;
 import jakarta.annotation.Resource;
 import lombok.Data;
@@ -16,7 +17,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +32,7 @@ import java.util.Map;
 @Component
 public class WxAccountUtil {
 
+    //银收客公众号推送
     @Value("${wx.ysk.appId}")
     private String appId = "wx212769170d2c6b2a";
     @Value("${wx.ysk.secrete}")
@@ -59,84 +60,73 @@ public class WxAccountUtil {
         linkedHashMap.put("47003", "参数错误");
     }
 
-    public String getAccessToken() {
-        String accessToken = Convert.toStr(redisService.get("accessToken"));
-        if (StrUtil.isNotEmpty(accessToken)) {
-            return accessToken;
-        }
-        String resp = HttpUtil.get(StrUtil.format("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={}&secret={}", appId, secrete));
-        JSONObject respInfo = JSONObject.parseObject(resp);
-        if (!respInfo.containsKey("access_token")) {
-            log.warn("公众号获取token失败, 响应内容: {}", resp);
-            throw new RuntimeException(resp);
-        }
-        accessToken = respInfo.getString("access_token");
-        int expiresIn = respInfo.getInteger("expires_in");
-        redisService.set("accessToken", accessToken, expiresIn - 10);
-        return accessToken;
-    }
-
-    public JSONObject sendTemplateMsg(String templateId, String toUserOpenId, Map<String, Object> data) {
-        log.info("开始发送微信模板消息， 接收用户openId: {}, 消息数据: {}", toUserOpenId, data);
-        String accessToken = getAccessToken();
-
-        JSONObject object1 = new JSONObject();
-
-        object1.put("template_id", templateId);
-        object1.put("touser", toUserOpenId);
-        object1.put("data", data);
-
-        String response = HttpRequest.post("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=".concat(accessToken)).body(object1.toString()).execute().body();
-        log.info("微信模板消息发送成功，响应内容:{}", response);
-        JSONObject resObj = JSONObject.parseObject(response);
-        if (ObjectUtil.isNotEmpty(resObj) && ObjectUtil.isNotNull(resObj) && "0".equals(resObj.get("errcode") + "")) {
-            return resObj;
-        }
-
-        throw new RuntimeException(linkedHashMap.getOrDefault(resObj.get("errcode") + "", "未知错误"));
-    }
-
     public void sendOperationMsg(List<String> openIdList, String userName, String operationDesc) {
         openIdList.forEach(openId -> {
-            Map<String, Object> data = new HashMap<String, Object>() {{
-                put("thing19", new HashMap<String, Object>() {{
-                    put("value", userName);
-                }});
-                put("thing8", new HashMap<String, Object>() {{
-                    put("value", StrUtil.sub(operationDesc,0,20));
-                }});
-                put("time21", new HashMap<String, Object>() {{
-                    put("value", DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss"));
-                }});
-            }};
-            log.info("开始发送敏感操作消息， 接收用户openId: {}, 操作用户: {}, 操作描述: {}", openId, userName, operationDesc);
+            Map<String, Object> data = Map.of(
+                    "thing19", Map.of("value", userName),
+                    "thing8", Map.of("value", StrUtil.sub(operationDesc, 0, 20)),
+                    "time21", Map.of("value", DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss"))
+            );
             try {
-                sendTemplateMsg(operationMsgTmpId, openId, data);
+                sendTemplateMsg("敏感操作", operationMsgTmpId, openId, data);
             } catch (Exception e) {
                 log.error("发送失败, openId: {}, 响应: {}", openId, e.getMessage());
             }
         });
     }
 
-    public void sendStockMsg(String shopName, String productName, BigDecimal stockNum, String openId) {
+    public void sendStockMsg(String typeName, String shopName, String productName, BigDecimal stockNum, String openId) {
         String stockNumStr = stockNum.toPlainString();
-        Map<String, Object> data = new HashMap<String, Object>() {{
-            put("thing22", new HashMap<String, Object>() {{
-                put("value", shopName);
-            }});
-            put("thing4", new HashMap<String, Object>() {{
-                put("value", productName);
-            }});
-            put("number5", new HashMap<String, Object>() {{
-                put("value", stockNumStr);
-            }});
-        }};
-        log.info("开始发送库存预警消息， 接收用户openId: {}, 消息数据: {}", openId, data);
+        Map<String, Object> data = Map.of(
+                //品名
+                "thing34", Map.of("value", typeName),
+                //商品名称
+                "thing4", Map.of("value", productName),
+                //商品数量
+                "number5", Map.of("value", stockNumStr),
+                //商家名称
+                "thing22", Map.of("value", shopName)
+        );
         try {
-            sendTemplateMsg(warnMsgTmpId, openId, data);
+            sendTemplateMsg("库存预警", warnMsgTmpId, openId, data);
         } catch (Exception e) {
             log.error("发送失败, openId:{}, msg: {}", openId, e.getMessage());
         }
     }
 
+    public String getAccessToken() {
+        synchronized (this) {
+            String accessToken = Convert.toStr(redisService.get("accessToken"));
+            if (StrUtil.isNotEmpty(accessToken)) {
+                return accessToken;
+            }
+            String resp = HttpUtil.get(StrUtil.format("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={}&secret={}", appId, secrete));
+            JSONObject respInfo = JSONObject.parseObject(resp);
+            if (!respInfo.containsKey("access_token")) {
+                log.warn("公众号获取token失败, 响应内容: {}", resp);
+                throw new RuntimeException(resp);
+            }
+            accessToken = respInfo.getString("access_token");
+            int expiresIn = respInfo.getInteger("expires_in");
+            redisService.set("accessToken", accessToken, expiresIn - 10);
+            return accessToken;
+        }
+    }
+
+    public JSONObject sendTemplateMsg(String detail, String templateId, String toUserOpenId, Map<String, Object> data) {
+        log.info("银收客公众号消息推送，消息类型：{} 接收用户openId: {}, 消息数据: {}", detail, toUserOpenId, data);
+        String accessToken = getAccessToken();
+        JSONObject object1 = new JSONObject();
+        object1.put("template_id", templateId);
+        object1.put("touser", toUserOpenId);
+        object1.put("data", data);
+
+        String response = HttpRequest.post("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=".concat(accessToken)).body(object1.toString()).execute().body();
+        log.info("银收客公众号消息推送，响应内容:{}", response);
+        JSONObject resObj = JSONObject.parseObject(response);
+        if (ObjectUtil.isNotEmpty(resObj) && ObjectUtil.isNotNull(resObj) && "0".equals(resObj.get("errcode") + "")) {
+            return resObj;
+        }
+        throw new CzgException(linkedHashMap.getOrDefault(resObj.get("errcode") + "", "未知错误"));
+    }
 }

cash-service/product-service/src/main/resources/mapper/ProductMapper.xml

@@ -149,7 +149,7 @@
             and t1.shop_id = #{shopId}
         </where>
         <if test="idList != null">
-            and t1.id in
+            and (t1.id in
             <foreach item="item" collection="idList" separator="," open="(" close=")">
                 #{item}
             </foreach>
@@ -157,6 +157,7 @@
             <foreach item="item" collection="idList" separator="," open="(" close=")">
                 #{item}
             </foreach>
+            )
         </if>
         order by t1.sort desc,t1.id desc
     </select>