| @@ -97,11 +97,11 @@ public class WxCreditHistoryController extends BaseController { | |||||
| String desc = ""; | String desc = ""; | ||||
| if(wxCreditHistory.getCreditType().equals(EnumScoreType.SPEND_CREDIT.getCode())){ | if(wxCreditHistory.getCreditType().equals(EnumScoreType.SPEND_CREDIT.getCode())){ | ||||
| WxMerchant byId = wxMerchantService.getById(wxCreditHistory.getMerchantId()); | WxMerchant byId = wxMerchantService.getById(wxCreditHistory.getMerchantId()); | ||||
| desc = "管理端("+user.getUsername()+")操作商户("+byId.getName()+")新增消费("+wxCreditHistory.getSpendStr()+"元)"; | |||||
| desc = "管理端手动积分:消费商户["+byId.getName()+"] 消费金额["+wxCreditHistory.getSpendStr()+"元]"; | |||||
| }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.REDUCE_CREDIT.getCode())){ | }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.REDUCE_CREDIT.getCode())){ | ||||
| desc = "管理端("+user.getUsername()+")操作积分兑换"; | |||||
| desc = "管理端手动扣减积分"; | |||||
| if(StringUtils.isNotBlank(wxCreditHistory.getChangePurpose())){ | if(StringUtils.isNotBlank(wxCreditHistory.getChangePurpose())){ | ||||
| desc = desc + "("+wxCreditHistory.getChangePurpose()+")"; | |||||
| desc = desc + "["+wxCreditHistory.getChangePurpose()+"]"; | |||||
| } | } | ||||
| }else{ | }else{ | ||||
| desc = "管理端("+user.getUsername()+")操作未知积分来源"; | desc = "管理端("+user.getUsername()+")操作未知积分来源"; | ||||
| @@ -276,7 +276,7 @@ public class WxCUserController extends BaseController { | |||||
| wxCreditHistory.setFinalTenantId(wxCUserBasicInfo.getFinalTenantId()); | wxCreditHistory.setFinalTenantId(wxCUserBasicInfo.getFinalTenantId()); | ||||
| wxCreditHistory.setCreateDate(new Date()); | wxCreditHistory.setCreateDate(new Date()); | ||||
| wxCreditHistory.setCreditType(enumScoreType.getCode()); | wxCreditHistory.setCreditType(enumScoreType.getCode()); | ||||
| wxCreditHistory.setChangePurpose("商户端("+wxMerchant.getName()+")("+bUser.getName()+")操作完善个人信息"); | |||||
| wxCreditHistory.setChangePurpose("商户端["+wxMerchant.getName()+"]操作完善个人信息"); | |||||
| wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); | wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); | ||||
| wxCreditHistory.setOperatorId(bUser.getId()); | wxCreditHistory.setOperatorId(bUser.getId()); | ||||
| wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | ||||
| @@ -111,17 +111,17 @@ public class WxCreditHistoryController extends BaseController { | |||||
| //消费积分:取当前人的商户ID | //消费积分:取当前人的商户ID | ||||
| if (wxCreditHistory.getCreditType() == EnumScoreType.REDUCE_CREDIT.getCode()) { | if (wxCreditHistory.getCreditType() == EnumScoreType.REDUCE_CREDIT.getCode()) { | ||||
| wxCreditHistory.setMerchantId(getLoginBUser().getMerchantId()); | wxCreditHistory.setMerchantId(getLoginBUser().getMerchantId()); | ||||
| wxCreditHistory.setChangePurpose("商户端("+wxMerchant.getName()+")("+getLoginBUser().getName()+")操作消费积分("+wxCreditHistory.getChangePurpose()+")"); | |||||
| wxCreditHistory.setChangePurpose("商户端手动扣减积分["+wxCreditHistory.getChangePurpose()+"]"); | |||||
| } else { | } else { | ||||
| //新增积分: | //新增积分: | ||||
| //如果为商管商户 则消费商户按前端传入的进行记录 | //如果为商管商户 则消费商户按前端传入的进行记录 | ||||
| if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { | if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { | ||||
| wxCreditHistory.setMerchantId(wxCreditHistory.getMerchantId()); | wxCreditHistory.setMerchantId(wxCreditHistory.getMerchantId()); | ||||
| WxMerchant byId = wxMerchantService.getById(wxCreditHistory.getMerchantId()); | WxMerchant byId = wxMerchantService.getById(wxCreditHistory.getMerchantId()); | ||||
| wxCreditHistory.setChangePurpose("商户端商管商户("+byId.getName()+")("+getLoginBUser().getName()+")新增积分"); | |||||
| wxCreditHistory.setChangePurpose("商户端手动积分:消费商户["+byId.getName()+"] 消费金额["+wxCreditHistory.getSpendStr()+"元]"); | |||||
| } else { | } else { | ||||
| wxCreditHistory.setMerchantId(getLoginBUser().getMerchantId()); | wxCreditHistory.setMerchantId(getLoginBUser().getMerchantId()); | ||||
| wxCreditHistory.setChangePurpose("商户端("+merchant.getName()+")("+getLoginBUser().getName()+")新增积分"); | |||||
| wxCreditHistory.setChangePurpose("商户端手动积分:消费商户["+merchant.getName()+"] 消费金额["+wxCreditHistory.getSpendStr()+"元]"); | |||||
| } | } | ||||
| } | } | ||||
| //B端操作用户 | //B端操作用户 | ||||
| @@ -1375,7 +1375,7 @@ public class PosServiceImpl implements PosService { | |||||
| creditHistory.setSpend(couponOrderCVo.getCouponPrice()); | creditHistory.setSpend(couponOrderCVo.getCouponPrice()); | ||||
| //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | ||||
| creditHistory.setMerchantId(wxMerchant.getId()); | creditHistory.setMerchantId(wxMerchant.getId()); | ||||
| creditHistory.setChangePurpose("pos消费("+wxMerchant.getName()+")("+merchantBUser.getName()+")("+coupon.getTitle()+")"); | |||||
| creditHistory.setChangePurpose("pos消费:消费商户["+wxMerchant.getName()+"] 卷名称["+coupon.getTitle()+"("+creditHistory.getSpendStr()+"元)] "); | |||||
| creditHistory = creditHistoryService.saveOrUpdate(creditHistory); | creditHistory = creditHistoryService.saveOrUpdate(creditHistory); | ||||
| if (creditHistory.getCreditNum() != null) { | if (creditHistory.getCreditNum() != null) { | ||||
| return creditHistory.getCreditNum(); | return creditHistory.getCreditNum(); | ||||
| @@ -1404,7 +1404,7 @@ public class PosServiceImpl implements PosService { | |||||
| creditHistory.setSpend(payment); | creditHistory.setSpend(payment); | ||||
| //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | ||||
| creditHistory.setMerchantId(merchant.getId()); | creditHistory.setMerchantId(merchant.getId()); | ||||
| creditHistory.setChangePurpose("pos消费("+merchant.getName()+")("+buUser.getName()+")消费("+creditHistory.getSpendStr()+")"); | |||||
| creditHistory.setChangePurpose("pos消费:消费商户["+merchant.getName()+"] 消费金额["+creditHistory.getSpendStr()+"元]"); | |||||
| creditHistory = creditHistoryService.saveOrUpdate(creditHistory); | creditHistory = creditHistoryService.saveOrUpdate(creditHistory); | ||||
| if (creditHistory.getCreditNum() != null) { | if (creditHistory.getCreditNum() != null) { | ||||
| return creditHistory.getCreditNum(); | return creditHistory.getCreditNum(); | ||||
| @@ -187,7 +187,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { | |||||
| wxCreditHistory.setCUserId(wxActivityJoin.getUserId()); | wxCreditHistory.setCUserId(wxActivityJoin.getUserId()); | ||||
| wxCreditHistory.setCreditNum(credit); | wxCreditHistory.setCreditNum(credit); | ||||
| wxCreditHistory.setCreditType(EnumScoreType.ACTIVITY_JOIN.getCode()); | wxCreditHistory.setCreditType(EnumScoreType.ACTIVITY_JOIN.getCode()); | ||||
| wxCreditHistory.setChangePurpose(EnumScoreType.ACTIVITY_JOIN.getMessage()+"("+wxActivity.getTitle()+")"); | |||||
| wxCreditHistory.setChangePurpose(EnumScoreType.ACTIVITY_JOIN.getMessage()+"["+wxActivity.getTitle()+"]"); | |||||
| wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); | wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); | ||||
| wxCreditHistory.setOperatorId(wxActivityJoin.getUserId()); | wxCreditHistory.setOperatorId(wxActivityJoin.getUserId()); | ||||
| wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | ||||
| @@ -1101,7 +1101,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc | |||||
| wxCreditHistory.setOperatorType(EnumUserType.MALLUSER.getCode()); | wxCreditHistory.setOperatorType(EnumUserType.MALLUSER.getCode()); | ||||
| } | } | ||||
| wxCreditHistory.setCreditType(EnumScoreType.MEM_IMPORT.getCode()); | wxCreditHistory.setCreditType(EnumScoreType.MEM_IMPORT.getCode()); | ||||
| wxCreditHistory.setChangePurpose(EnumScoreType.MEM_IMPORT.getMessage()+"("+mallUserInfo.getUsername()+")"); | |||||
| wxCreditHistory.setChangePurpose(EnumScoreType.MEM_IMPORT.getMessage()); | |||||
| if (oldUserBase != null) { | if (oldUserBase != null) { | ||||
| wxCreditHistory.setCUserId(oldUserBase.getId()); | wxCreditHistory.setCUserId(oldUserBase.getId()); | ||||
| } else { | } else { | ||||
| @@ -311,7 +311,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | ||||
| creditHistory.setMerchantId(record.getMerchantId()); | creditHistory.setMerchantId(record.getMerchantId()); | ||||
| WxMerchant wxMerchant = wxMerchantMapper.selectById(record.getMerchantId()); | WxMerchant wxMerchant = wxMerchantMapper.selectById(record.getMerchantId()); | ||||
| creditHistory.setChangePurpose("卡消费("+wxMerchant.getName()+")消费"+creditHistory.getSpendStr()); | |||||
| creditHistory.setChangePurpose("卡消费:消费商户["+wxMerchant.getName()+"] 金额["+creditHistory.getSpendStr()+"元]"); | |||||
| wxCreditHistoryService.saveOrUpdate(creditHistory); | wxCreditHistoryService.saveOrUpdate(creditHistory); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("积分值:" + e.getMessage()); | logger.error("积分值:" + e.getMessage()); | ||||
| @@ -934,7 +934,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | ||||
| creditHistory.setMerchantId(record.getMerchantId()); | creditHistory.setMerchantId(record.getMerchantId()); | ||||
| // WxMerchant wxMerchant = wxMerchantMapper.selectById(record.getMerchantId()); | // WxMerchant wxMerchant = wxMerchantMapper.selectById(record.getMerchantId()); | ||||
| creditHistory.setChangePurpose("pos卡消费("+merchant.getName()+")消费"+creditHistory.getSpendStr()); | |||||
| creditHistory.setChangePurpose("pos卡消费:消费商户["+merchant.getName()+"] 金额["+creditHistory.getSpendStr()+"]元"); | |||||
| creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory); | creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory); | ||||
| if (creditHistory != null) { | if (creditHistory != null) { | ||||
| scoreCreditCalc.setCredit(scoreCreditCalc.getCredit() + creditHistory.getCreditNum()); | scoreCreditCalc.setCredit(scoreCreditCalc.getCredit() + creditHistory.getCreditNum()); | ||||
| @@ -466,7 +466,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| creditHistory.setMerchantId(bUser.getMerchantId()); | creditHistory.setMerchantId(bUser.getMerchantId()); | ||||
| creditHistory.setBuserId(bUser.getBuserId()); | creditHistory.setBuserId(bUser.getBuserId()); | ||||
| WxMerchant wxMerchant = wxMerchantMapper.selectById(bUser.getMerchantId()); | WxMerchant wxMerchant = wxMerchantMapper.selectById(bUser.getMerchantId()); | ||||
| creditHistory.setChangePurpose("商户端("+wxMerchant.getName()+")("+bUser.getName()+")核销("+wxCoupon.getTitle()+")"); | |||||
| creditHistory.setChangePurpose("商户核销增加积分:商户名称["+wxMerchant.getName()+"] 券名称["+wxCoupon.getTitle()+"("+creditHistory.getSpendStr()+")] "); | |||||
| wxCreditHistoryService.saveOrUpdate(creditHistory); | wxCreditHistoryService.saveOrUpdate(creditHistory); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("积分值:" + e.getMessage()); | logger.error("积分值:" + e.getMessage()); | ||||
| @@ -497,7 +497,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| creditHistory.setCouponId(wxCoupon.getId()); | creditHistory.setCouponId(wxCoupon.getId()); | ||||
| creditHistory.setBusinessId(wxCoupon.getBusiness()); | creditHistory.setBusinessId(wxCoupon.getBusiness()); | ||||
| creditHistory.setSpend(couponOrder.getCouponPrice()); | creditHistory.setSpend(couponOrder.getCouponPrice()); | ||||
| creditHistory.setChangePurpose("核销停车劵("+wxCoupon.getTitle()+")"); | |||||
| creditHistory.setChangePurpose("核销停车劵["+wxCoupon.getTitle()+"("+creditHistory.getSpendStr()+"元)] "); | |||||
| wxCreditHistoryService.saveOrUpdate(creditHistory); | wxCreditHistoryService.saveOrUpdate(creditHistory); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("积分值:" + e.getMessage()); | logger.error("积分值:" + e.getMessage()); | ||||
| @@ -1572,8 +1572,12 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| if (updateOrder.getCouponChannelId() != null) { | if (updateOrder.getCouponChannelId() != null) { | ||||
| WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId(),updateOrder.getTenantId()); | WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId(),updateOrder.getTenantId()); | ||||
| creditHistory.setCouponId(wxCouponChannel.getCouponId()); | creditHistory.setCouponId(wxCouponChannel.getCouponId()); | ||||
| } | } | ||||
| creditHistory.setChangePurpose("("+wxMerchant.getName()+")付款码消费("+creditHistory.getSpendStr()+")元"); | |||||
| creditHistory.setChangePurpose("付款码消费:消费商户["+wxMerchant.getName()+"] 金额["+creditHistory.getSpendStr()+"元]"); | |||||
| wxCreditHistoryService.saveOrUpdate(creditHistory); | wxCreditHistoryService.saveOrUpdate(creditHistory); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("积分值:" + e.getMessage()); | logger.error("积分值:" + e.getMessage()); | ||||
| @@ -2206,7 +2210,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| creditHistory.setTenantId(coupon.getFinalTenantId()); | creditHistory.setTenantId(coupon.getFinalTenantId()); | ||||
| creditHistory.setFinalTenantId(coupon.getFinalTenantId()); | creditHistory.setFinalTenantId(coupon.getFinalTenantId()); | ||||
| creditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); | creditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); | ||||
| creditHistory.setChangePurpose(EnumScoreType.CHANGE_CREDIT.getMessage()+"("+coupon.getTitle()+")"); | |||||
| creditHistory.setChangePurpose(EnumScoreType.CHANGE_CREDIT.getMessage()+"["+coupon.getTitle()+"]"); | |||||
| creditHistory.setCouponId(coupon.getId()); | creditHistory.setCouponId(coupon.getId()); | ||||
| //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | ||||
| setMerchantId(coupon, creditHistory); | setMerchantId(coupon, creditHistory); | ||||
| @@ -215,7 +215,7 @@ public class DataInitController extends BaseController { | |||||
| //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | ||||
| creditHistory.setMerchantId(buUser.getMerchantId()); | creditHistory.setMerchantId(buUser.getMerchantId()); | ||||
| WxMerchant wxMerchant = merchantService.getById(buUser.getMerchantId()); | WxMerchant wxMerchant = merchantService.getById(buUser.getMerchantId()); | ||||
| creditHistory.setChangePurpose("核销积分数据修复(商户["+wxMerchant.getName()+"]核销["+coupon.getTitle()+"])"); | |||||
| creditHistory.setChangePurpose("核销积分数据修复:消费商户["+wxMerchant.getName()+"] 卷名称["+coupon.getTitle()+"("+creditHistory.getSpendStr()+"元)] "); | |||||
| creditHistoryService.saveOrUpdate(creditHistory); | creditHistoryService.saveOrUpdate(creditHistory); | ||||
| }); | }); | ||||
| } | } | ||||