fix: 霸王餐充值不送积分
This commit is contained in:
@@ -1630,6 +1630,7 @@ public class PayService {
|
||||
* @param payOrderNo 三方交易订单号
|
||||
*/
|
||||
private void checkFreeDineForMemberInCallBack(TbMemberIn memberIn, String payType, String payOrderNo) {
|
||||
log.info("校验是否为霸王餐充值回调");
|
||||
// 判断是否是霸王餐充值活动
|
||||
if (memberIn.getOrderId() != null) {
|
||||
TbOrderInfo orderInfo = mpOrderInfoMapper.selectById(memberIn.getOrderId());
|
||||
@@ -1724,7 +1725,7 @@ public class PayService {
|
||||
|
||||
//充值送积分
|
||||
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());
|
||||
}
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
|
||||
Reference in New Issue
Block a user