diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index b8a443bde..ebec546a6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -97,14 +97,14 @@ public class WxCreditHistoryController extends BaseController { String desc = ""; if(wxCreditHistory.getCreditType().equals(EnumScoreType.SPEND_CREDIT.getCode())){ WxMerchant byId = wxMerchantService.getById(wxCreditHistory.getMerchantId()); - desc = "A端("+user.getUsername()+")操作新增商户("+byId.getName()+")消费("+wxCreditHistory.getSpendStr()+"元)积分"; + desc = "管理端("+user.getUsername()+")操作商户("+byId.getName()+")新增消费("+wxCreditHistory.getSpendStr()+"元)"; }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.REDUCE_CREDIT.getCode())){ - desc = "A端("+user.getUsername()+")操作积分兑换"; + desc = "管理端("+user.getUsername()+")操作积分兑换"; if(StringUtils.isNotBlank(wxCreditHistory.getChangePurpose())){ desc = desc + "("+wxCreditHistory.getChangePurpose()+")"; } }else{ - desc = "A端("+user.getUsername()+")操作未知积分来源"; + desc = "管理端("+user.getUsername()+")操作未知积分来源"; } wxCreditHistory.setChangePurpose(desc); try { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 63fe6e57c..013583d67 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -109,6 +109,13 @@ public class WxCUserController extends BaseController { if(wxCUserFromB != null){ wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getCUserId(),bUser.getFinalTenantId()); if (!wxCUserBasicInfo.getPhone().equals(wxCUserFromBDto.getPhone())){ + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxCUser.getTenantId()); + tenantEntity.setParentTenantId(wxCUser.getParentTenantId()); + WxCUserBasicInfo infoByPhone = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, wxCUserFromBDto.getPhone()); + if(infoByPhone != null){ + return new ResultData(ErrorCode.USER_PHONE_IS_FOUND,"手机号已存在"); + } wxCUser.setPhone(wxCUserFromBDto.getPhone()); wxCUserBasicInfo.setPhone(wxCUserFromBDto.getPhone()); } @@ -135,6 +142,13 @@ public class WxCUserController extends BaseController { if(wxCUser.getUserId() != null){ wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUser.getUserId(),wxCUser.getFinalTenantId()); if (!wxCUserBasicInfo.getPhone().equals(wxCUserFromBDto.getPhone())){ + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxCUser.getTenantId()); + tenantEntity.setParentTenantId(wxCUser.getParentTenantId()); + WxCUserBasicInfo infoByPhone = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, wxCUserFromBDto.getPhone()); + if(infoByPhone != null){ + return new ResultData(ErrorCode.USER_PHONE_IS_FOUND,"手机号已存在"); + } wxCUser.setPhone(wxCUserFromBDto.getPhone()); wxCUserBasicInfo.setPhone(wxCUserFromBDto.getPhone()); } @@ -163,6 +177,13 @@ public class WxCUserController extends BaseController { wxCUserFromB.setAppId(wxCUserFromBDto.getAppId()); wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); }else{ + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxCUser.getTenantId()); + tenantEntity.setParentTenantId(wxCUser.getParentTenantId()); + WxCUserBasicInfo infoByPhone = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, wxCUserFromBDto.getPhone()); + if(infoByPhone != null){ + return new ResultData(ErrorCode.USER_PHONE_IS_FOUND,"手机号已存在"); + } isAddCredit = true; wxCUserBasicInfo = new WxCUserBasicInfo(); wxCUserBasicInfo.setId(idWorker.nextId()); @@ -189,6 +210,13 @@ public class WxCUserController extends BaseController { } }else{ + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxCUser.getTenantId()); + tenantEntity.setParentTenantId(wxCUser.getParentTenantId()); + WxCUserBasicInfo infoByPhone = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, wxCUserFromBDto.getPhone()); + if(infoByPhone != null){ + return new ResultData(ErrorCode.USER_PHONE_IS_FOUND,"手机号已存在"); + } isAddCredit = true; wxCUserBasicInfo = new WxCUserBasicInfo(); wxCUserBasicInfo.setId(idWorker.nextId()); @@ -248,7 +276,7 @@ public class WxCUserController extends BaseController { wxCreditHistory.setFinalTenantId(wxCUserBasicInfo.getFinalTenantId()); wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreditType(enumScoreType.getCode()); - wxCreditHistory.setChangePurpose("B端("+wxMerchant.getName()+")("+bUser.getName()+")操作完善个人信息"); + wxCreditHistory.setChangePurpose("商户端("+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 5902fd749..2a85728d1 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().getName()+")消费"+wxCreditHistory.getChangePurpose()); + wxCreditHistory.setChangePurpose("商户端("+wxMerchant.getName()+")("+getLoginBUser().getName()+")操作消费积分("+wxCreditHistory.getChangePurpose()+")"); } 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().getName()+")新增积分"); + wxCreditHistory.setChangePurpose("商户端商管商户("+byId.getName()+")("+getLoginBUser().getName()+")新增积分"); } else { wxCreditHistory.setMerchantId(getLoginBUser().getMerchantId()); - wxCreditHistory.setChangePurpose("B端("+merchant.getName()+")("+getLoginBUser().getName()+")新增积分"); + wxCreditHistory.setChangePurpose("商户端("+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 539ed630f..8804ef543 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -1375,7 +1375,7 @@ public class PosServiceImpl implements PosService { creditHistory.setSpend(couponOrderCVo.getCouponPrice()); //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 creditHistory.setMerchantId(wxMerchant.getId()); - creditHistory.setChangePurpose("pos消费 店铺("+wxMerchant.getName()+")卷("+coupon.getTitle()+")"); + creditHistory.setChangePurpose("pos消费("+wxMerchant.getName()+")("+merchantBUser.getName()+")("+coupon.getTitle()+")"); creditHistory = creditHistoryService.saveOrUpdate(creditHistory); if (creditHistory.getCreditNum() != null) { return creditHistory.getCreditNum(); @@ -1388,12 +1388,12 @@ public class PosServiceImpl implements PosService { return 0; } - private int posAddCreditForPay(WxMerchant merchant, Long buUserId, Long memId, Integer payment) { + private int posAddCreditForPay(WxMerchant merchant,WxMerchantBUser buUser, Long memId, Integer payment) { try { //-------此处为【现金支付】记录增加积分操作------- WxCreditHistory creditHistory = new WxCreditHistory(); creditHistory.setOperatorType(EnumUserType.BUSER.getCode()); - creditHistory.setOperatorId(buUserId); + creditHistory.setOperatorId(buUser.getId()); creditHistory.setCUserId(memId); creditHistory.setCreateDate(new Date()); // creditHistory.updateTenantInfo(merchant); @@ -1404,7 +1404,7 @@ public class PosServiceImpl implements PosService { creditHistory.setSpend(payment); //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 creditHistory.setMerchantId(merchant.getId()); - creditHistory.setChangePurpose("pos消费 店铺("+merchant.getName()+")消费("+creditHistory.getSpendStr()+")"); + creditHistory.setChangePurpose("pos消费("+merchant.getName()+")("+buUser.getName()+")消费("+creditHistory.getSpendStr()+")"); creditHistory = creditHistoryService.saveOrUpdate(creditHistory); if (creditHistory.getCreditNum() != null) { return creditHistory.getCreditNum(); @@ -2363,7 +2363,7 @@ public class PosServiceImpl implements PosService { // 4. 积分 try { - int credit = posAddCreditForPay(merchant, buUser.getId(), memId, neuPaymentAmount); + int credit = posAddCreditForPay(merchant, buUser, memId, neuPaymentAmount); scoreCreditCalc.setCredit(scoreCreditCalc.getCredit() + credit); } catch (Exception e) { logger.error("交易核销积分异常:" + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java index d7eaef5b0..1b0fff986 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java @@ -45,7 +45,7 @@ public class WxCreditHistoryVo extends BaseTenantEntity { @io.swagger.annotations.ApiModelProperty(value = "操作人类型", name = "operator") private Integer operatorType; - @Excel(name = "操作说明", width = 20, orderNum = "9", replace = {"每日登录_1", "消费_2", "绑车牌_3", "连接WIFI_4", "微信用户昵称授权_5", "微信用户手机授权_6", "完善个人信息_7", "会员导入_8", "会员成长值扣减_9", "新增积分_10", "积分兑换_11", "消费积分_12", "活动报名_13"}) + @Excel(name = "操作说明", width = 20, orderNum = "9", replace = {"每日登录_1", "消费_2", "绑车牌_3", "连接WIFI_4", "微信用户昵称授权_5", "微信用户手机授权_6", "完善个人信息_7", "会员导入_8", "会员成长值扣减_9", "新增积分_10", "积分兑换_11", "消费积分_12", "活动报名_13", "积分清零计划_14", "游戏消耗积分_15", "游戏奖励积分_16"}) @io.swagger.annotations.ApiModelProperty(value = "积分类型", name = "creditType") private Integer creditType; @@ -73,6 +73,7 @@ public class WxCreditHistoryVo extends BaseTenantEntity { @io.swagger.annotations.ApiModelProperty(value = "小票号", name = "ticketNumber") private String ticketNumber; + @Excel(name = "说明", width = 20, orderNum = "11") @io.swagger.annotations.ApiModelProperty(value = "兑换用途", name = "changePurpose") private String changePurpose; 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 ae9b2cfde..3ebb11724 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -466,7 +466,7 @@ 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()+")"); + creditHistory.setChangePurpose("商户端("+wxMerchant.getName()+")("+bUser.getName()+")核销("+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 352f65076..593e02ef5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1573,7 +1573,7 @@ public class WxOrderServiceImpl implements WxOrderService { WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId(),updateOrder.getTenantId()); creditHistory.setCouponId(wxCouponChannel.getCouponId()); } - creditHistory.setChangePurpose("付款码消费("+wxMerchant.getName()+")消费("+creditHistory.getSpendStr()+")"); + creditHistory.setChangePurpose("("+wxMerchant.getName()+")付款码消费("+creditHistory.getSpendStr()+")元"); wxCreditHistoryService.saveOrUpdate(creditHistory); } catch (Exception e) { logger.error("积分值:" + e.getMessage());