|
|
|
@@ -105,6 +105,9 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
@Autowired |
|
|
|
WxCreditHistoryService wxCreditHistoryService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxCouponChannelMapper wxCouponChannelMapper; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxOrder> listAsPage(WxOrder record, Integer pageIndex, Integer pageSize) { |
|
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); |
|
|
|
@@ -951,6 +954,25 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("成长值:" + e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
// 积分 计算 |
|
|
|
try { |
|
|
|
//扣减积分操作记录 |
|
|
|
WxCreditHistory creditHistory = new WxCreditHistory(); |
|
|
|
creditHistory.setOperatorType(EnumUserType.CUSER.getCode()); |
|
|
|
creditHistory.setOperatorId(user.getId()); |
|
|
|
creditHistory.setCUserId(user.getId()); |
|
|
|
creditHistory.setCreateDate(new Date()); |
|
|
|
creditHistory.setTenantId(user.getTenantId()); |
|
|
|
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); |
|
|
|
creditHistory.setCouponId(coupon.getId()); |
|
|
|
creditHistory.setBusinessId(Long.valueOf(coupon.getBusiness())); |
|
|
|
creditHistory.setSpend(updateOrder.getPayment()); |
|
|
|
//creditHistory.setMerchantId(wxMerchant.getId()); |
|
|
|
wxCreditHistoryService.saveOrUpdate(creditHistory); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("积分值:" + e.getMessage()); |
|
|
|
} |
|
|
|
return ret; |
|
|
|
} |
|
|
|
|
|
|
|
@@ -994,6 +1016,27 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("成长值:" + e.getMessage()); |
|
|
|
} |
|
|
|
// 积分 计算 |
|
|
|
try { |
|
|
|
//扣减积分操作记录 |
|
|
|
WxCreditHistory creditHistory = new WxCreditHistory(); |
|
|
|
creditHistory.setOperatorType(EnumUserType.CUSER.getCode()); |
|
|
|
creditHistory.setOperatorId(user.getId()); |
|
|
|
creditHistory.setCUserId(user.getId()); |
|
|
|
creditHistory.setCreateDate(new Date()); |
|
|
|
creditHistory.setTenantId(user.getTenantId()); |
|
|
|
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); |
|
|
|
if (updateOrder.getCouponChannelId() != null) { |
|
|
|
WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectByPrimaryKey(updateOrder.getCouponChannelId()); |
|
|
|
creditHistory.setCouponId(wxCouponChannel.getCouponId()); |
|
|
|
} |
|
|
|
creditHistory.setBusinessId(Long.valueOf(wxMerchant.getBusinessId())); |
|
|
|
creditHistory.setSpend(updateOrder.getPayment()); |
|
|
|
creditHistory.setMerchantId(wxMerchant.getId()); |
|
|
|
wxCreditHistoryService.saveOrUpdate(creditHistory); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("积分值:" + e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
return ret; |
|
|
|
} |
|
|
|
|