From 6e6d29532288f93f31c404bda423c8b2403767f9 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 26 Dec 2020 17:22:36 +0800 Subject: [PATCH] jifen --- .../com/iformall/controller/WxCUserController.java | 2 +- .../controller/WxCreditHistoryController.java | 6 +++--- .../com/iformall/service/impl/PosServiceImpl.java | 12 ++++++++---- .../java/com/iformall/domain/po/WxCreditHistory.java | 7 +++++++ .../service/impl/WxActivityJoinServiceImpl.java | 1 + .../service/impl/WxCUserBasicInfoServiceImpl.java | 1 + .../iformall/service/impl/WxCUserServiceImpl.java | 1 + .../service/impl/WxCardSpendServiceImpl.java | 4 ++++ .../service/impl/WxCouponOrderServiceImpl.java | 3 +++ .../iformall/service/impl/WxOrderServiceImpl.java | 8 +++++--- .../iformall/service/park/impl/util/ParkHelper.java | 1 + 11 files changed, 35 insertions(+), 11 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index e448cee9c..63fe6e57c 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -248,7 +248,7 @@ public class WxCUserController extends BaseController { wxCreditHistory.setFinalTenantId(wxCUserBasicInfo.getFinalTenantId()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(enumScoreType.getCode()); - wxCreditHistory.setChangePurpose("B端("+wxMerchant.getName()+")("+bUser.getPhone()+")操作完善个人信息"); + wxCreditHistory.setChangePurpose("B端("+wxMerchant.getName()+")("+bUser.getName()+")操作完善个人信息"); wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); wxCreditHistory.setOperatorId(bUser.getId()); wxCreditHistoryService.saveOrUpdate(wxCreditHistory); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index dab36e25d..5d8e5d33d 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -111,17 +111,17 @@ public class WxCreditHistoryController extends BaseController { //消费积分:取当前人的商户ID if (wxCreditHistory.getCreditType() == EnumScoreType.REDUCE_CREDIT.getCode()) { wxCreditHistory.setMerchantId(getLoginBUser().getMerchantId()); - wxCreditHistory.setChangePurpose("B端("+wxMerchant.getName()+")("+getLoginBUser().getPhone()+")消费"+wxCreditHistory.getSpendStr()); + wxCreditHistory.setChangePurpose("B端("+wxMerchant.getName()+")("+getLoginBUser().getName()+")消费"+wxCreditHistory.getSpendStr()); } else { //新增积分: //如果为商管商户 则消费商户按前端传入的进行记录 if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { wxCreditHistory.setMerchantId(wxCreditHistory.getMerchantId()); WxMerchant byId = wxMerchantService.getById(wxCreditHistory.getMerchantId()); - wxCreditHistory.setChangePurpose("B端商管商户给("+byId.getName()+")("+getLoginBUser().getPhone()+")新增积分"); + wxCreditHistory.setChangePurpose("B端商管商户给("+byId.getName()+")("+getLoginBUser().getName()+")新增积分"); } else { wxCreditHistory.setMerchantId(getLoginBUser().getMerchantId()); - wxCreditHistory.setChangePurpose("B端("+merchant.getName()+")("+getLoginBUser().getPhone()+")新增积分"); + wxCreditHistory.setChangePurpose("B端("+merchant.getName()+")("+getLoginBUser().getName()+")新增积分"); } } //B端操作用户 diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 4e588e0b3..539ed630f 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -58,6 +58,7 @@ public class PosServiceImpl implements PosService { private final WxCouponOrderMapper couponOrderMapper; private final WxCouponMerchantMapper couponMerchantMapper; private final WxCouponMapper couponMapper; + private final WxMerchantMapper merchantMapper; /** @@ -1357,12 +1358,12 @@ public class PosServiceImpl implements PosService { logger.info("核销已完成: " + couponOrderCVo.getId()); } - private int posAddCredit(WxCouponOrderCVo couponOrderCVo, WxCoupon coupon, Long merchantId, Long buUserId) { + private int posAddCredit(WxCouponOrderCVo couponOrderCVo, WxCoupon coupon, WxMerchantBUser merchantBUser, WxMerchant wxMerchant) { try { //-------此处为【现金支付】记录增加积分操作------- WxCreditHistory creditHistory = new WxCreditHistory(); creditHistory.setOperatorType(EnumUserType.BUSER.getCode()); - creditHistory.setOperatorId(buUserId); + creditHistory.setOperatorId(merchantBUser.getId()); creditHistory.setCUserId(couponOrderCVo.getcUserId()); creditHistory.setCreateDate(new Date()); // creditHistory.updateTenantInfo(couponOrderCVo); @@ -1373,7 +1374,8 @@ public class PosServiceImpl implements PosService { creditHistory.setBusinessId(coupon.getBusiness()); creditHistory.setSpend(couponOrderCVo.getCouponPrice()); //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 - creditHistory.setMerchantId(merchantId); + creditHistory.setMerchantId(wxMerchant.getId()); + creditHistory.setChangePurpose("pos消费 店铺("+wxMerchant.getName()+")卷("+coupon.getTitle()+")"); creditHistory = creditHistoryService.saveOrUpdate(creditHistory); if (creditHistory.getCreditNum() != null) { return creditHistory.getCreditNum(); @@ -1402,6 +1404,7 @@ public class PosServiceImpl implements PosService { creditHistory.setSpend(payment); //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 creditHistory.setMerchantId(merchant.getId()); + creditHistory.setChangePurpose("pos消费 店铺("+merchant.getName()+")消费("+creditHistory.getSpendStr()+")"); creditHistory = creditHistoryService.saveOrUpdate(creditHistory); if (creditHistory.getCreditNum() != null) { return creditHistory.getCreditNum(); @@ -2201,7 +2204,8 @@ public class PosServiceImpl implements PosService { // 4. 积分 try { - int credit = posAddCredit(couponOrderCVo, wxCoupon, merchantBUser.getMerchantId(), merchantBUser.getId()); + WxMerchant wxMerchant = merchantMapper.selectById(merchantBUser.getMerchantId()); + int credit = posAddCredit(couponOrderCVo, wxCoupon, merchantBUser, wxMerchant); scoreCreditCalc.setCredit(scoreCreditCalc.getCredit() + credit); } catch (Exception e) { logger.error("交易核销积分异常:" + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index 467bf1871..489bace93 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -78,4 +79,10 @@ public class WxCreditHistory extends BaseTenantEntity { @io.swagger.annotations.ApiModelProperty(value = "标签", name = "tags") private List tags; + public String getSpendStr() { + if(getSpend()!=null) { + spendStr = new BigDecimal(getSpend()).divide(new BigDecimal(100)).toString(); + } + return spendStr; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 4d5458bbf..a5340dc2c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -187,6 +187,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { wxCreditHistory.setCUserId(wxActivityJoin.getUserId()); wxCreditHistory.setCreditNum(credit); wxCreditHistory.setCreditType(EnumScoreType.ACTIVITY_JOIN.getCode()); + wxCreditHistory.setChangePurpose(EnumScoreType.ACTIVITY_JOIN.getMessage()+"("+wxActivity.getTitle()+")"); wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); wxCreditHistory.setOperatorId(wxActivityJoin.getUserId()); wxCreditHistoryService.saveOrUpdate(wxCreditHistory); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index a531d7af4..f9f9773a7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1101,6 +1101,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc wxCreditHistory.setOperatorType(EnumUserType.MALLUSER.getCode()); } wxCreditHistory.setCreditType(EnumScoreType.MEM_IMPORT.getCode()); + wxCreditHistory.setChangePurpose(EnumScoreType.MEM_IMPORT.getMessage()+"("+mallUserInfo.getUsername()+")"); if (oldUserBase != null) { wxCreditHistory.setCUserId(oldUserBase.getId()); } else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index 7ea0bb98a..2cde73cf7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -346,6 +346,7 @@ public class WxCUserServiceImpl implements WxCUserService { wxCreditHistory.setFinalTenantId(user.getFinalTenantId()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(enumScoreType.getCode()); + wxCreditHistory.setChangePurpose(enumScoreType.getMessage()); wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); wxCreditHistory.setOperatorId(user.getUserId()); // wxCreditHistory.setCreditNum(user.getCredit()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 432b4b797..050795533 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -310,6 +310,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { creditHistory.setSpend(real_payment); //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 creditHistory.setMerchantId(record.getMerchantId()); + WxMerchant wxMerchant = wxMerchantMapper.selectById(record.getMerchantId()); + creditHistory.setChangePurpose("卡消费("+wxMerchant.getName()+")消费"+creditHistory.getSpendStr()); wxCreditHistoryService.saveOrUpdate(creditHistory); } catch (Exception e) { logger.error("积分值:" + e.getMessage()); @@ -931,6 +933,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { creditHistory.setSpend(record.getRealPayment()); //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 creditHistory.setMerchantId(record.getMerchantId()); +// WxMerchant wxMerchant = wxMerchantMapper.selectById(record.getMerchantId()); + creditHistory.setChangePurpose("pos卡消费("+merchant.getName()+")消费"+creditHistory.getSpendStr()); creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory); if (creditHistory != null) { scoreCreditCalc.setCredit(scoreCreditCalc.getCredit() + creditHistory.getCreditNum()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 616417864..ae9b2cfde 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -465,6 +465,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 creditHistory.setMerchantId(bUser.getMerchantId()); creditHistory.setBuserId(bUser.getBuserId()); + WxMerchant wxMerchant = wxMerchantMapper.selectById(bUser.getMerchantId()); + creditHistory.setChangePurpose("("+wxMerchant.getName()+")核销("+wxCoupon.getTitle()+")"); wxCreditHistoryService.saveOrUpdate(creditHistory); } catch (Exception e) { logger.error("积分值:" + e.getMessage()); @@ -495,6 +497,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { creditHistory.setCouponId(wxCoupon.getId()); creditHistory.setBusinessId(wxCoupon.getBusiness()); creditHistory.setSpend(couponOrder.getCouponPrice()); + creditHistory.setChangePurpose("核销停车劵("+wxCoupon.getTitle()+")"); wxCreditHistoryService.saveOrUpdate(creditHistory); } catch (Exception e) { logger.error("积分值:" + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index a9b7c601d..352f65076 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1566,13 +1566,14 @@ public class WxOrderServiceImpl implements WxOrderService { creditHistory.setTenantId(wxMerchant.getFinalTenantId()); creditHistory.setFinalTenantId(wxMerchant.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); + creditHistory.setBusinessId(wxMerchant.getBusinessId()); + creditHistory.setSpend(updateOrder.getPayment()); + creditHistory.setMerchantId(wxMerchant.getId()); if (updateOrder.getCouponChannelId() != null) { WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId(),updateOrder.getTenantId()); creditHistory.setCouponId(wxCouponChannel.getCouponId()); } - creditHistory.setBusinessId(wxMerchant.getBusinessId()); - creditHistory.setSpend(updateOrder.getPayment()); - creditHistory.setMerchantId(wxMerchant.getId()); + creditHistory.setChangePurpose("付款码消费("+wxMerchant.getName()+")消费("+creditHistory.getSpendStr()+")"); wxCreditHistoryService.saveOrUpdate(creditHistory); } catch (Exception e) { logger.error("积分值:" + e.getMessage()); @@ -2205,6 +2206,7 @@ public class WxOrderServiceImpl implements WxOrderService { creditHistory.setTenantId(coupon.getFinalTenantId()); creditHistory.setFinalTenantId(coupon.getFinalTenantId()); creditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); + creditHistory.setChangePurpose(EnumScoreType.CHANGE_CREDIT.getMessage()+"("+coupon.getTitle()+")"); creditHistory.setCouponId(coupon.getId()); //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 setMerchantId(coupon, creditHistory); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java index 92f776c88..b0def6f5a 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java @@ -85,6 +85,7 @@ public class ParkHelper { wxCreditHistory.setFinalTenantId(park.getFinalTenantId()); // wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode()); + wxCreditHistory.setChangePurpose(EnumScoreType.BIND_CAR.getMessage()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); wxCreditHistory.setOperatorId(cuUserId); wxCreditHistoryService.saveOrUpdate(wxCreditHistory);