czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 霸王餐充值不送积分

Browse Source
This commit is contained in:
张松
2024-11-21 16:26:51 +08:00
parent ff4ed58506
commit 7a0e0f1343
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -1630,6 +1630,7 @@ public class PayService {
* @param payOrderNo 三方交易订单号 * @param payOrderNo 三方交易订单号
*/ */
private void checkFreeDineForMemberInCallBack(TbMemberIn memberIn, String payType, String payOrderNo) { private void checkFreeDineForMemberInCallBack(TbMemberIn memberIn, String payType, String payOrderNo) {
log.info("校验是否为霸王餐充值回调");
// 判断是否是霸王餐充值活动 // 判断是否是霸王餐充值活动
if (memberIn.getOrderId() != null) { if (memberIn.getOrderId() != null) {
TbOrderInfo orderInfo = mpOrderInfoMapper.selectById(memberIn.getOrderId()); TbOrderInfo orderInfo = mpOrderInfoMapper.selectById(memberIn.getOrderId());
@@ -1724,7 +1725,7 @@ public class PayService {
//充值送积分 //充值送积分
TbActivate activate = tbActivateMapper.selectByAmountScope(tbShopUser.getShopId(), memberIn.getAmount()); TbActivate activate = tbActivateMapper.selectByAmountScope(tbShopUser.getShopId(), memberIn.getAmount());
if (ObjectUtil.isNotNull(activate)) { if (memberIn.getOrderId() == null && ObjectUtil.isNotNull(activate)) {
tbMemberPointsService.addPoints(Convert.toLong(tbShopUser.getId()), activate.getGiftPoints(), StrUtil.format("充值￥{}送{}积分", memberIn.getAmount(), activate.getGiftPoints()), null, memberIn.getOrderNo()); tbMemberPointsService.addPoints(Convert.toLong(tbShopUser.getId()), activate.getGiftPoints(), StrUtil.format("充值￥{}送{}积分", memberIn.getAmount(), activate.getGiftPoints()), null, memberIn.getOrderNo());
} }
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();