backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: backend:8c476ff60cf3666a5c284a3215ef054d6b284146
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0
...
compare: backend:328e4b676ecc9c8499c8b1d39984cebae2b007f8
Branches Tags
backend:main
backend:dev
backend:pre_20251101
backend:20251022
backend:dev2
backend:v1.0.0

2 Commits
8c476ff60c ... 328e4b676e

Author SHA1 Message Date
liyj
328e4b676e 消息订阅模板绑定问题修复 2025-09-23 18:15:11 +08:00
liyj
c01dd85fdb 订单无法扣除商品库存问题修复 2025-09-23 18:15:10 +08:00
2 changed files with 10 additions and 5 deletions
Show Stats Expand all files Collapse all files

13
mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBindConnectServiceImpl.java
View File

@ -5,8 +5,8 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray; import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.suisung.mall.account.mapper.AccountUserBindConnectMapper; import com.suisung.mall.account.mapper.AccountUserBindConnectMapper;
import com.suisung.mall.account.service.AccountUserBaseService; import com.suisung.mall.account.service.AccountUserBaseService;
import com.suisung.mall.account.service.AccountUserBindConnectService; import com.suisung.mall.account.service.AccountUserBindConnectService;
@ -538,9 +538,9 @@ public class AccountUserBindConnectServiceImpl extends BaseServiceImpl<AccountUs
log.info("jsonObject:{}", jsonObject); log.info("jsonObject:{}", jsonObject);
String openId=jsonObject.getStr("FromUserName");//用户openid String openId=jsonObject.getStr("FromUserName");//用户openid
QueryWrapper<AccountUserBindConnect> queryWrapper = new QueryWrapper<>(); QueryWrapper<AccountUserBindConnect> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("bind_id",openId) queryWrapper.eq("bind_openid",openId)
.eq("user_type", CommonConstant.USER_TYPE_NORMAL) .eq("user_type", CommonConstant.USER_TYPE_NORMAL)
.eq("bind_type",15) .in("bind_type",Arrays.asList(1,15))
.eq("bind_active", CommonConstant.Enable); .eq("bind_active", CommonConstant.Enable);
AccountUserBindConnect accountUserBindConnect= findOne(queryWrapper); AccountUserBindConnect accountUserBindConnect= findOne(queryWrapper);
if (accountUserBindConnect != null) { if (accountUserBindConnect != null) {
@ -551,7 +551,12 @@ public class AccountUserBindConnectServiceImpl extends BaseServiceImpl<AccountUs
String SubscribeStatusString= object.getStr("SubscribeStatusString");//订阅结果（accept接收；reject拒收）参考地址https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/subscribe-message.html#%E8%AE%A2%E9%98%85%E6%B6%88%E6%81%AF%E8%AF%AD%E9%9F%B3%E6%8F%90%E9%86%92 String SubscribeStatusString= object.getStr("SubscribeStatusString");//订阅结果（accept接收；reject拒收）参考地址https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/subscribe-message.html#%E8%AE%A2%E9%98%85%E6%B6%88%E6%81%AF%E8%AF%AD%E9%9F%B3%E6%8F%90%E9%86%92
if(SubscribeStatusString.equals("accept")){ if(SubscribeStatusString.equals("accept")){
accountUserBindConnect.setBind_tmpl(templateId); accountUserBindConnect.setBind_tmpl(templateId);
updateById(accountUserBindConnect); UpdateWrapper<AccountUserBindConnect> updateWrapper = new UpdateWrapper<>(accountUserBindConnect);
updateWrapper.set("bind_id",accountUserBindConnect.getBind_id());
updateWrapper.set("bind_type",accountUserBindConnect.getBind_type());
updateWrapper.set("user_id",accountUserBindConnect.getUser_id());
updateWrapper.set("user_type",accountUserBindConnect.getUser_type());
update(updateWrapper);
} }
} }
} }

2
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
View File

@ -3259,7 +3259,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
Integer order_item_inventory_lock = order_item_row.getOrder_item_inventory_lock(); Integer order_item_inventory_lock = order_item_row.getOrder_item_inventory_lock();
String item_src_id = order_item_row.getItem_src_id(); String item_src_id = order_item_row.getItem_src_id();
if (ObjectUtil.equal(1002, order_item_inventory_lock) && CheckUtil.isEmpty(item_src_id)) { if (ObjectUtil.equal(1002, order_item_inventory_lock) && CheckUtil.isNotEmpty(item_src_id)) {
Long item_id = order_item_row.getItem_id(); Long item_id = order_item_row.getItem_id();
if (shopProductItemService.lockSkuStock(item_id, order_item_row.getOrder_item_quantity()) <= 0) { if (shopProductItemService.lockSkuStock(item_id, order_item_row.getOrder_item_quantity()) <= 0) {
logger.error("更改: {} 冻结库存失败!", item_id); logger.error("更改: {} 冻结库存失败!", item_id);