Browse Source

Merge branch 'release_real_202010' of https://git.malls.iformall.com/server/formallProject into release_real_202010

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
c71aaa469f
30 changed files with 131 additions and 115 deletions
  1. +22
    -20
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java
  3. +2
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java
  4. +9
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  5. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java
  6. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  7. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java
  8. +2
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  9. +7
    -8
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  10. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java
  11. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java
  12. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java
  13. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java
  14. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java
  15. +2
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java
  16. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java
  17. +2
    -2
      mallinkService/src/main/java/com/iformall/service/WxScoreRulesService.java
  18. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java
  19. +7
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  20. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  21. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  22. +18
    -17
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
  23. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  24. +8
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java
  25. +2
    -1
      mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java
  26. +8
    -8
      mallinkService/src/main/java/com/iformall/utils/CreditUtil.java
  27. +1
    -1
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml
  28. +2
    -16
      mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml
  29. +1
    -8
      mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml
  30. +1
    -1
      mallinkSysAdmin/src/main/java/com/iformall/controller/datafix/DataInitController.java

+ 22
- 20
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java View File

@@ -43,12 +43,9 @@ public class WxCreditHistoryController extends BaseController {
public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list");
if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory();
TenantEntity tenantEntity = ifParentUpdateTenantInfo();
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
wxCreditHistory.setTenantId(tenantEntity.getParentTenantId());
}else{
wxCreditHistory.setTenantId(tenantEntity.getTenantId());
}
TenantEntity tenantInfo = getTenantInfo();
wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId());
wxCreditHistory.setFinalTenantId(tenantInfo.getFinalTenantId());
final PageInfo<WxCreditHistoryVo> page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize);
return new ResultData(page);
}
@@ -67,7 +64,7 @@ public class WxCreditHistoryController extends BaseController {
}

try {
Map<String, Integer> result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantInfo()) ;
Map<String, Integer> result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantInfo().getFinalTenantId()) ;
return new ResultData(result);
} catch (MallinkException e) {
return new ResultData(e.getErrorCode(),e.getMessage());
@@ -86,7 +83,7 @@ public class WxCreditHistoryController extends BaseController {
wxCreditHistory.setTenantId(user.getFinalTenantId());
wxCreditHistory.setOperatorId(user.getId());
try {
wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),wxCreditHistory) ;
wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),getTenantInfo()) ;
WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory);
return new ResultData(Result.SUCCESS, "操作成功", credit);
} catch (MallinkException e) {
@@ -119,12 +116,14 @@ public class WxCreditHistoryController extends BaseController {
@SystemControllerLog(description = "积分历史-导出数据")
public void exportData(@ModelAttribute WxCreditHistory wxCreditHistory, HttpServletRequest request, HttpServletResponse response) {
// wxCreditHistory.updateTenantInfo(getTenantInfo());
TenantEntity tenantEntity = ifParentUpdateTenantInfo();
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
wxCreditHistory.setTenantId(tenantEntity.getParentTenantId());
}else{
wxCreditHistory.setTenantId(tenantEntity.getTenantId());
}
// TenantEntity tenantEntity = ifParentUpdateTenantInfo();
// if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
// wxCreditHistory.setTenantId(tenantEntity.getParentTenantId());
// }else{
// wxCreditHistory.setTenantId(tenantEntity.getTenantId());
// }
wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId());
wxCreditHistory.setFinalTenantId(getTenantInfo().getFinalTenantId());
wxCreditHistoryService.exportData(request, response, wxCreditHistory);
}

@@ -134,12 +133,15 @@ public class WxCreditHistoryController extends BaseController {
public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary");
// wxCreditHistory.updateTenantInfo(getTenantInfo());
TenantEntity tenantEntity = ifParentUpdateTenantInfo();
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
wxCreditHistory.setTenantId(tenantEntity.getParentTenantId());
}else{
wxCreditHistory.setTenantId(tenantEntity.getTenantId());
}
// TenantEntity tenantEntity = ifParentUpdateTenantInfo();
// if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
// wxCreditHistory.setTenantId(tenantEntity.getParentTenantId());
// }else{
// wxCreditHistory.setTenantId(tenantEntity.getTenantId());
// }
TenantEntity tenantInfo = getTenantInfo();
wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId());
wxCreditHistory.setFinalTenantId(tenantInfo.getFinalTenantId());
return wxCreditHistoryService.getCreditSummary(wxCreditHistory);
}



+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java View File

@@ -56,7 +56,7 @@ public class WxScoreRulesController extends BaseController {
@SystemControllerLog(description = "积分-配置")
public ResultData creditRulesList() {
logger.debug("[" + getIpAddr() + "] WxScoreRulesController::list");
WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(ifParentUpdateTenantInfo());
WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(getTenantInfo().getFinalTenantId());
return new ResultData(scoreRules);
}



+ 2
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java View File

@@ -192,7 +192,8 @@ public class WxCUserController extends BaseController {
private void addCredit(WxCUserBasicInfo wxCUserBasicInfo, EnumScoreType enumScoreType, Long userId, TenantEntity tenantEntity) {
WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setCUserId(wxCUserBasicInfo.getId());
wxCreditHistory.updateTenantInfo(tenantEntity);
// wxCreditHistory.updateTenantInfo(tenantEntity);
wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId());
wxCreditHistory.setCreateDate(new Date());
wxCreditHistory.setCreditType(enumScoreType.getCode());
wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode());


+ 9
- 4
mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java View File

@@ -71,7 +71,7 @@ public class WxCreditHistoryController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL) ;
}
try {
Map<String, Integer> result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantInfo());
Map<String, Integer> result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId, getTenantInfo().getFinalTenantId());
return new ResultData(result);
} catch (MallinkException e) {
return new ResultData(e.getErrorCode(), e.getMessage());
@@ -99,7 +99,9 @@ public class WxCreditHistoryController extends BaseController {
@PostMapping("/add")
public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) {
log.debug("[" + getIpAddr() + "] WxCreditHistoryController::add");
wxCreditHistory.updateTenantInfo(getTenantInfo());
// wxCreditHistory.updateTenantInfo(getTenantInfo());
TenantEntity tenantInfo = getTenantInfo();
wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId());
wxCreditHistory.setOperatorId(getLoginBUser().getId());
WxMerchant wxMerchant = new WxMerchant();
wxMerchant.setId(getLoginBUser().getMerchantId());
@@ -120,14 +122,15 @@ public class WxCreditHistoryController extends BaseController {
//B端操作用户
wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode());
try {
wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),wxCreditHistory);

wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),tenantInfo);
if (null != getLoginBUser().getBuserId()) {
wxCreditHistory.setBuserId(getLoginBUser().getBuserId());
}
WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory);
//更新标签
if (wxCreditHistory.getTags() != null && !wxCreditHistory.getTags().isEmpty()) {
wxCUserTagsService.updateTagByUserId(wxCreditHistory.getCUserId(),wxCreditHistory, wxCreditHistory.getTags());
wxCUserTagsService.updateTagByUserId(wxCreditHistory.getCUserId(),tenantInfo, wxCreditHistory.getTags());
}
return new ResultData(Result.SUCCESS, "操作成功", credit);
} catch (MallinkException e) {
@@ -144,6 +147,8 @@ public class WxCreditHistoryController extends BaseController {
public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) {
log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list");
if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId());
wxCreditHistory.setFinalTenantId(getTenantInfo().getFinalTenantId());
WxMerchantBUser bUser = getLoginBUser();
WxMerchant merchant = wxMerchantService.getById(wxCreditHistory.getMerchantId());
if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) {


+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java View File

@@ -83,7 +83,7 @@ public class WxMerchantBUserController extends BaseController {
}

resultMap.put("creditLocked", merchant.getCreditLocked());
WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(user);
WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(user.getFinalTenantId());
if (scoreRules.getCreditLocked().equals(EnumCreditLockedStatus.CLOSE.getCode())) {
resultMap.put("creditLocked", EnumCreditLockedStatus.CLOSE.getCode());
}


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java View File

@@ -46,6 +46,7 @@ public class WxCreditHistoryController extends BaseController{
} catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage());
}
wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId());
wxCreditHistory.setCUserId(memberId);
wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC);
final PageInfo<WxCreditHistory> page = wxCreditHistoryService.listAsPage(wxCreditHistory, pageNum, pageSize);


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java View File

@@ -32,6 +32,7 @@ public class WxScoreHistoryController extends BaseController {
public ResultData list(Integer pageNum, Integer pageSize) {
WxScoreHistory wxScoreHistory = new WxScoreHistory();
// wxScoreHistory.updateTenantInfo(getTenantInfo());
wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId());
Long memberId;
try {
memberId = getMemberId();


+ 2
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java View File

@@ -970,7 +970,8 @@ public class WxUserGrantController extends BaseController {
//增加积分
WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setCUserId(record.getId());
wxCreditHistory.updateTenantInfo(tenantEntity);
// wxCreditHistory.updateTenantInfo(tenantEntity);
wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId());
wxCreditHistory.setCreateDate(new Date());
wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode());
wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode());


+ 7
- 8
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java View File

@@ -1363,7 +1363,8 @@ public class PosServiceImpl implements PosService {
creditHistory.setOperatorId(buUserId);
creditHistory.setCUserId(couponOrderCVo.getcUserId());
creditHistory.setCreateDate(new Date());
creditHistory.updateTenantInfo(couponOrderCVo);
// creditHistory.updateTenantInfo(couponOrderCVo);
creditHistory.setTenantId(couponOrderCVo.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setCouponId(couponOrderCVo.getCouponId());
creditHistory.setBusinessId(coupon.getBusiness());
@@ -1390,7 +1391,8 @@ public class PosServiceImpl implements PosService {
creditHistory.setOperatorId(buUserId);
creditHistory.setCUserId(memId);
creditHistory.setCreateDate(new Date());
creditHistory.updateTenantInfo(merchant);
// creditHistory.updateTenantInfo(merchant);
creditHistory.setTenantId(merchant.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setBusinessId(merchant.getBusinessId());
creditHistory.setSpend(payment);
@@ -1422,11 +1424,7 @@ public class PosServiceImpl implements PosService {
creditHistory.setOperatorId(buUserId);
creditHistory.setCUserId(couponOrderCVo.getcUserId());
// creditHistory.updateTenantInfo(couponOrderCVo);
if(StringUtils.isNotBlank(couponOrderCVo.getParentTenantId())){
creditHistory.setTenantId(couponOrderCVo.getParentTenantId());
}else{
creditHistory.setTenantId(couponOrderCVo.getTenantId());
}
creditHistory.setTenantId(couponOrderCVo.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setCouponId(couponOrderCVo.getCouponId());
int num = creditHistoryService.cancelCredit(creditHistory);
@@ -1441,7 +1439,8 @@ public class PosServiceImpl implements PosService {
// 2. 成长值历史回退
try {
WxScoreHistory scoreHistory = new WxScoreHistory();
scoreHistory.updateTenantInfo(couponOrderCVo);
// scoreHistory.updateTenantInfo(couponOrderCVo);
scoreHistory.setTenantId(couponOrderCVo.getFinalTenantId());
scoreHistory.setScoreType(EnumScoreType.CONSUMPTION.getCode());
scoreHistory.setCUserId(couponOrderCVo.getcUserId());
scoreHistory.setOrderId(couponOrderCVo.getOrderId());


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java View File

@@ -337,7 +337,7 @@ public class CouponSendSchedule {
}
}

int birthdayScale = CreditUtil.getBirthdayScoreScale(tenantEntity, wxScoreRulesService);
int birthdayScale = CreditUtil.getBirthdayScoreScale(tenantEntity.getFinalTenantId(), wxScoreRulesService);
for (WxCUserBasicInfo cu : couponSendedUsers) {
// 记录积分倍率日期
try {


+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java View File

@@ -2,6 +2,7 @@ package com.iformall.domain.po;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.BaseTenantEntity;
import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -12,7 +13,7 @@ import java.util.List;
@TableName(value = "wx_credit_history")
@Data
@EqualsAndHashCode(callSuper = true)
public class WxCreditHistory extends TenantEntity {
public class WxCreditHistory extends BaseTenantEntity {
protected Long id;



+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java View File

@@ -2,6 +2,7 @@ package com.iformall.domain.po;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.BaseTenantEntity;
import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +12,7 @@ import java.util.*;
@TableName(value = "wx_score_history")
@Data
@EqualsAndHashCode(callSuper = true)
public class WxScoreHistory extends TenantEntity {
public class WxScoreHistory extends BaseTenantEntity {
protected Long id;



+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java View File

@@ -21,6 +21,17 @@ public class BaseTenantEntity extends BaseEntity {
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId")
protected String parentTenantId;

@TableField(exist = false)
protected String finalTenantId;

public String getFinalTenantId() {
return finalTenantId;
}

public void setFinalTenantId(String finalTenantId) {
this.finalTenantId = finalTenantId;
}
@TableField(exist = false)
@JsonProperty(access = JsonProperty.Access.READ_ONLY)


+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java View File

@@ -1,6 +1,7 @@
package com.iformall.domain.vo;

import cn.afterturn.easypoi.excel.annotation.Excel;
import com.iformall.domain.po.base.BaseTenantEntity;
import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,7 +10,7 @@ import java.util.Date;

@Data
@EqualsAndHashCode(callSuper = true)
public class WxCreditHistoryVo extends TenantEntity {
public class WxCreditHistoryVo extends BaseTenantEntity {


@Excel(name = "微信昵称", width = 20, orderNum = "1")


+ 2
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java View File

@@ -77,7 +77,8 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S
*/
// List<WxCUserBasicInfo> selectNotCUserList();

void cuserOldToNew(@Param(value = "oldCuserId")Long oldCuserId, @Param(value = "newCuserId")Long newCuserId,@Param("tableIndex")Integer tableIndex);
void cuserOldToNew(@Param(value = "oldCuserId")Long oldCuserId, @Param(value = "newCuserId")Long newCuserId,
@Param("tableIndex")Integer tableIndex,@Param("finalTableIndex")Integer finalTableIndex);

}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java View File

@@ -68,7 +68,7 @@ public interface WxCreditHistoryService {
*/
//void deleteById(Long id);

Map<String, Integer> findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity);
Map<String, Integer> findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, String tenantId);
void clearCreditByYear();



+ 2
- 2
mallinkService/src/main/java/com/iformall/service/WxScoreRulesService.java View File

@@ -25,10 +25,10 @@ public interface WxScoreRulesService {

/**
* 获取租户的积分规则
* @param tenantEntity
* @param
* @return
*/
WxScoreRules getCreditRules(TenantEntity tenantEntity);
WxScoreRules getCreditRules(String tenantId);
/**
* 保存或更新实体
*


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java View File

@@ -181,7 +181,8 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
Integer credit = wxActivity.getCredit();
//积分历史
WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.updateTenantInfo(wxActivity);
// wxCreditHistory.updateTenantInfo(wxActivity);
wxCreditHistory.setTenantId(wxActivity.getFinalTenantId());
wxCreditHistory.setCUserId(wxActivityJoin.getUserId());
wxCreditHistory.setCreditNum(credit);
wxCreditHistory.setCreditType(EnumScoreType.ACTIVITY_JOIN.getCode());


+ 7
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java View File

@@ -1071,7 +1071,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
//积分处理逻辑:覆盖原积分 记录历史
if (credit != null) {
WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.updateTenantInfo(mallUserInfo);
// wxCreditHistory.updateTenantInfo(mallUserInfo);
wxCreditHistory.setTenantId(mallUserInfo.getFinalTenantId());
wxCreditHistory.setCreateDate(new Date());
if (mallUserInfo != null) {
wxCreditHistory.setOperatorId(mallUserInfo.getId());
@@ -1215,9 +1216,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public void cuserOldToNew(Long oldCuserId, Long newCuserId,TenantEntity tenantinfo) {
String finalTenantId = tenantinfo.getFinalTenantId();
Integer tableIndex = Integer.parseInt(String.valueOf(Long.parseLong(finalTenantId)%100));
wxCUserBasicInfoMapper.cuserOldToNew(oldCuserId,newCuserId,tableIndex);
String tenantId = tenantinfo.getTenantId();
String finalTenantId = tenantinfo.getFinalTenantId();
Integer tableIndex = Integer.parseInt(String.valueOf(Long.parseLong(tenantId)%100));
Integer finalTableIndex = Integer.parseInt(String.valueOf(Long.parseLong(finalTenantId)%100));
wxCUserBasicInfoMapper.cuserOldToNew(oldCuserId,newCuserId,tableIndex,finalTableIndex);
}

@Override


+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java View File

@@ -295,7 +295,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
creditHistory.setOperatorId(record.getOwnerId());
creditHistory.setCUserId(record.getOwnerId());
creditHistory.setCreateDate(new Date());
creditHistory.updateTenantInfo(record);
// creditHistory.updateTenantInfo(record);
creditHistory.setTenantId(record.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setBusinessId(coupon.getBusiness());
creditHistory.setSpend(real_payment);
@@ -914,7 +915,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
creditHistory.setOperatorId(buUser.getId());
creditHistory.setCUserId(record.getOwnerId());
creditHistory.setCreateDate(new Date());
creditHistory.updateTenantInfo(record);
// creditHistory.updateTenantInfo(record);
creditHistory.setTenantId(record.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setBusinessId(merchant.getBusinessId());
creditHistory.setSpend(record.getRealPayment());


+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -445,7 +445,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
creditHistory.setOperatorId(bUser.getId());
creditHistory.setCUserId(couponOrder.getcUserId());
creditHistory.setCreateDate(new Date());
creditHistory.updateTenantInfo(couponOrder);
// creditHistory.updateTenantInfo(couponOrder);
creditHistory.setTenantId(couponOrder.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setCouponId(wxCoupon.getId());
creditHistory.setBusinessId(wxCoupon.getBusiness());
@@ -476,7 +477,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
creditHistory.setOperatorId(cuUser.getId());
creditHistory.setCUserId(couponOrder.getcUserId());
creditHistory.setCreateDate(new Date());
creditHistory.updateTenantInfo(couponOrder);
// creditHistory.updateTenantInfo(couponOrder);
creditHistory.setTenantId(couponOrder.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setCouponId(wxCoupon.getId());
creditHistory.setBusinessId(wxCoupon.getBusiness());


+ 18
- 17
mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java View File

@@ -199,7 +199,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public WxCreditHistory saveOrUpdate(WxCreditHistory record) {
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getFinalTenantId());
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId());
if (wxCUserBasicInfo == null) {
//验证此用户是否存在
throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE);
@@ -227,7 +227,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
if (record.getCreditType().equals(EnumScoreType.CONSUMPTION.getCode()) || record.getCreditType().equals(EnumScoreType.SPEND_CREDIT.getCode())) {
//等级积分配置
try {
creditChangeNum = CreditUtil.calUserCredit(record,creditChangeNumOrigin, wxCUserBasicInfo, wxScoreRulesService,wxLevelConfigMapper);
creditChangeNum = CreditUtil.calUserCredit(creditChangeNumOrigin, wxCUserBasicInfo, wxScoreRulesService,wxLevelConfigMapper);
if (Objects.nonNull(CreditUtil.getIsBirthDayScale())) {
hasBirthDateCredit = true;
}
@@ -297,7 +297,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
return 0;
}
// 2. user
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getFinalTenantId());
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId());
if (wxCUserBasicInfo != null) {
WxCUserBasicInfo wxCUserBasicInfoNew = new WxCUserBasicInfo();
wxCUserBasicInfoNew.setId(wxCUserBasicInfo.getId());
@@ -314,22 +314,22 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
// }

@Override
public Map<String, Integer> findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity) {
public Map<String, Integer> findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, String tenantId) {
WxMerchant wxMerchant = wxMerchantMapper.selectById(merchantId);
Map<String, Integer> creditMap = Maps.newHashMap();
if (wxMerchant != null && wxMerchant.getBusinessId() != null) {
WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setBusinessId(wxMerchant.getBusinessId());
//wxCreditHistory.updateTenantInfo(tenantEntity);
wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId());
wxCreditHistory.setTenantId(tenantId);
int credit;
int creditNew = 0 ;
if (StringUtils.isNotBlank(spendStr)) {
wxCreditHistory.setSpend(new BigDecimal(spendStr).multiply(new BigDecimal(100)).intValue());
credit = payAddCredit(wxCreditHistory);
if (Objects.nonNull(userId)) {
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(userId,tenantEntity.getFinalTenantId());
creditNew = CreditUtil.calUserCredit(tenantEntity,credit, wxCUserBasicInfo, wxScoreRulesService,wxLevelConfigMapper);
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(userId,tenantId);
creditNew = CreditUtil.calUserCredit(credit, wxCUserBasicInfo, wxScoreRulesService,wxLevelConfigMapper);
} else {
creditNew = credit;
}
@@ -391,45 +391,46 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
return 0;
}
// 1. 获取当前租户下积分的增加规则
WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record);
WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId());
// 2. 增长的积分
return wxScoreRules.getRule(EnumScoreType.LOGIN, WxScoreRules.SCORE);
}

private int bindCarAddCredit(WxCreditHistory record) {
// 1. 获取score rules
WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record);
WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId());
// 2. 增长的积分
return wxScoreRules.getRule(EnumScoreType.BIND_CAR, WxScoreRules.SCORE);
}

private int personAddCredit(WxCreditHistory record) {
// 1. 获取score rules
WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record);
WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId());
// 2. 增长的积分
return wxScoreRules.getRule(EnumScoreType.WECHAT_PERSION, WxScoreRules.SCORE);
}

private int phoneAddCredit(WxCreditHistory record) {
// 1. 获取score rules
WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record);
WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId());
// 2. 获取成长值
return wxScoreRules.getRule(EnumScoreType.WECHAT_PHONE, WxScoreRules.SCORE);
}

private int checkCompleteInfoScoreCount(TenantEntity tenantEntity,WxCUserBasicInfo cUser) {
private int checkCompleteInfoScoreCount(WxCUserBasicInfo cUser) {
WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setTenantId(cUser.getFinalTenantId());
wxCreditHistory.setCUserId(cUser.getId());
wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode());
return wxCreditHistoryMapper.countList(wxCreditHistory);
}

private int infoAddCredit(WxCreditHistory record) {
WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getFinalTenantId());
if (user == null || checkCompleteInfoScoreCount(record,user) > 0)
WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId());
if (user == null || checkCompleteInfoScoreCount(user) > 0)
return 0;
// 1. 获取score rules
WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record);
WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record.getTenantId());
// 2. 获取成长值
return scoreRules.getRule(EnumScoreType.COMPLETE_INFO, WxScoreRules.SCORE);
}
@@ -443,7 +444,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND);
}
//根据商户id和花费金额计算需要新增的积分
Map<String, Integer> map = findByMerchantIdAndSpend(record.getMerchantId(), record.getSpendStr(), null,record);
Map<String, Integer> map = findByMerchantIdAndSpend(record.getMerchantId(), record.getSpendStr(), null,record.getTenantId());
return map.get("credit");
}

@@ -458,7 +459,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
if (record.getCreditNum() != null && record.getCreditNum() == 0)
return 0;
// 1. 获取score rules
WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record);
WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(record.getTenantId());

// 2. 获取成长值 by id
JSONObject payRule = scoreRules.getRuleObj(EnumScoreType.CONSUMPTION);


+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -1542,7 +1542,8 @@ public class WxOrderServiceImpl implements WxOrderService {
creditHistory.setOperatorId(user.getId());
creditHistory.setCUserId(user.getId());
creditHistory.setCreateDate(new Date());
creditHistory.updateTenantInfo(wxMerchant);
// creditHistory.updateTenantInfo(wxMerchant);
creditHistory.setTenantId(wxMerchant.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
if (updateOrder.getCouponChannelId() != null) {
WxCouponChannel wxCouponChannel = wxCouponChannelMapper.selectById(updateOrder.getCouponChannelId(),updateOrder.getTenantId());
@@ -2179,7 +2180,8 @@ public class WxOrderServiceImpl implements WxOrderService {
}
creditHistory.setCreditNum(coupon.getCreditPrice());
creditHistory.setCUserId(user.getId());
creditHistory.updateTenantInfo(coupon);
// creditHistory.updateTenantInfo(coupon);
creditHistory.setTenantId(coupon.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode());
creditHistory.setCouponId(coupon.getId());
//如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户


+ 8
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java View File

@@ -186,13 +186,13 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
}

@Override
public WxScoreRules getCreditRules(TenantEntity tenantEntity) {
String tenantId = "";
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
tenantId = tenantEntity.getParentTenantId();
}else{
tenantId = tenantEntity.getTenantId();
}
public WxScoreRules getCreditRules(String tenantId) {
// String tenantId = "";
// if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){
// tenantId = tenantEntity.getParentTenantId();
// }else{
// tenantId = tenantEntity.getTenantId();
// }
// get pushLime from cache
String key = Constant.CREDIT_RULES_KEY_PREV + tenantId;

@@ -283,7 +283,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
return 0;
}
// 2. user score back
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getFinalTenantId());
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getCUserId(),record.getTenantId());
if (wxCUserBasicInfo != null) {
WxCUserBasicInfo wxCUserBasicInfoNew = new WxCUserBasicInfo();
wxCUserBasicInfoNew.setId(wxCUserBasicInfo.getId());


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java View File

@@ -80,7 +80,8 @@ public class ParkHelper {
public void addCredit(WxPark park, Long cuUserId){
WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setCUserId(cuUserId);
wxCreditHistory.updateTenantInfo(park);
// wxCreditHistory.updateTenantInfo(park);
wxCreditHistory.setTenantId(park.getFinalTenantId());
wxCreditHistory.setCreateDate(new Date());
wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode());
wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode());


+ 8
- 8
mallinkService/src/main/java/com/iformall/utils/CreditUtil.java View File

@@ -24,7 +24,7 @@ public class CreditUtil {
* @param wxLevelConfigMapper
* @return
*/
public static int calUserCredit(TenantEntity tenantEntity,int creditOrigin, WxCUserBasicInfo wxCUserBasicInfo, WxScoreRulesService wxScoreRulesService, WxLevelConfigMapper wxLevelConfigMapper) {
public static int calUserCredit(int creditOrigin, WxCUserBasicInfo wxCUserBasicInfo, WxScoreRulesService wxScoreRulesService, WxLevelConfigMapper wxLevelConfigMapper) {
Long userId = wxCUserBasicInfo.getId();
Integer score = wxCUserBasicInfo.getPoins();
String tenantId = wxCUserBasicInfo.getFinalTenantId();
@@ -34,7 +34,7 @@ public class CreditUtil {
int levelScale = getLevelScale(score, levelScaleConfig);

// 获取生日积分倍率:
int birthdayScale = getBirthdayScale(tenantEntity,wxCUserBasicInfo, wxScoreRulesService);
int birthdayScale = getBirthdayScale(wxCUserBasicInfo, wxScoreRulesService);

int creditNew = new BigDecimal(creditOrigin)
.multiply(new BigDecimal(levelScale))
@@ -76,7 +76,7 @@ public class CreditUtil {
* @param wxScoreRulesService
* @return
*/
private static int getBirthdayScale(TenantEntity tenantEntity,WxCUserBasicInfo wxCUserBasicInfo, WxScoreRulesService wxScoreRulesService) {
private static int getBirthdayScale(WxCUserBasicInfo wxCUserBasicInfo, WxScoreRulesService wxScoreRulesService) {
int birthdayScale = WxScoreRules.DEFAULT_SCALE;
if (Objects.isNull(wxCUserBasicInfo) || StringUtils.isBlank(wxCUserBasicInfo.getPhone())) {
return 0;
@@ -86,14 +86,14 @@ public class CreditUtil {
if(Objects.isNull(wxCUserBasicInfo.getScoreDate())) {
//设置过生日的用户
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getBirthdate()) == 0) {
birthdayScale = getBirthdayScoreScale(tenantEntity,wxScoreRulesService);
birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getFinalTenantId(),wxScoreRulesService);
} else {
log.info("积分倍率计算:未设置生日或生日条件未匹配={}", wxCUserBasicInfo.getScoreDate());
}
} else {
//发过生日券的用户或者享受过生日积分倍率的用户
if (Objects.nonNull(wxCUserBasicInfo.getScoreDate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getScoreDate()) == 0) {
birthdayScale = getBirthdayScoreScale(tenantEntity, wxScoreRulesService);
birthdayScale = getBirthdayScoreScale(wxCUserBasicInfo.getFinalTenantId(), wxScoreRulesService);
}
}

@@ -107,13 +107,13 @@ public class CreditUtil {
/**
* 获取生日积分倍率
*
* @param tenantEntity
* @param
* @param wxScoreRulesService
* @return
*/
public static int getBirthdayScoreScale(TenantEntity tenantEntity, WxScoreRulesService wxScoreRulesService) {
public static int getBirthdayScoreScale(String tenantId, WxScoreRulesService wxScoreRulesService) {
int birthdayScale = WxScoreRules.DEFAULT_SCALE;
WxScoreRules rules = wxScoreRulesService.getCreditRules(tenantEntity);
WxScoreRules rules = wxScoreRulesService.getCreditRules(tenantId);
if (Objects.nonNull(rules) && Objects.nonNull(rules.getScale())) {
//规则存使用积分倍率
birthdayScale = rules.getScale();


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml View File

@@ -1049,6 +1049,6 @@
</select>-->

<update id="cuserOldToNew" statementType="CALLABLE" >
{call cuser_old_to_new(#{oldCuserId},#{newCuserId},#{tableIndex})}
{call cuser_old_to_new(#{oldCuserId},#{newCuserId},#{tableIndex},#{finalTableIndex})}
</update>
</mapper>

+ 2
- 16
mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml View File

@@ -4,7 +4,6 @@
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxCreditHistory">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" />
<result column="c_user_id" jdbcType="BIGINT" property="cUserId" />
<result column="credit_amount" jdbcType="INTEGER" property="creditAmount" />
<result column="credit_num" jdbcType="INTEGER" property="creditNum" />
@@ -23,7 +22,7 @@
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose`,`ticket_number`,`buser_id`
`id`,`tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose`,`ticket_number`,`buser_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -34,9 +33,6 @@
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != cUserId ">
and `c_user_id` = #{cUserId}
</if>
@@ -105,11 +101,8 @@
and credit.create_date &lt; #{endTime}
</if>
<if test=" null != tenantId and '' != tenantId">
and ( credit.`tenant_id` = #{tenantId} or credit.`parent_tenant_id` = #{tenantId} )
and credit.`tenant_id` = #{tenantId}
</if>
<!-- <if test=" null != parentTenantId and '' != parentTenantId">-->
<!-- and credit.`parent_tenant_id` = #{parentTenantId}-->
<!-- </if>-->
<if test=" null != operatorType ">
and credit.operator_type = #{operatorType}
</if>
@@ -154,7 +147,6 @@
basic.phone phone,
basic.sex sex,
credit.tenant_id tenantId,
credit.parent_tenant_id parentTenantId,
credit.c_user_id cUserId,
credit.credit_amount creditAmount,
credit.credit_num creditNum,
@@ -199,9 +191,6 @@
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != cUserId ">
and `c_user_id` = #{cUserId}
</if>
@@ -222,9 +211,6 @@
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != cUserId ">
and `c_user_id` = #{cUserId}
</if>


+ 1
- 8
mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml View File

@@ -4,7 +4,6 @@
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxScoreHistory">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" />
<result column="c_user_id" jdbcType="BIGINT" property="cUserId"/>
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="score_type" jdbcType="INTEGER" property="scoreType"/>
@@ -17,7 +16,7 @@
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`create_date`,`score_type`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`,`reason`
`id`,`tenant_id`,`c_user_id`,`create_date`,`score_type`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`,`reason`
</sql>

<sql id="dynamicWhereConditions">
@@ -30,9 +29,6 @@
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>

<if test=" null != cUserId ">
and `c_user_id` = #{cUserId}
@@ -111,9 +107,6 @@
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != cUserId ">
and `c_user_id` = #{cUserId}
</if>


+ 1
- 1
mallinkSysAdmin/src/main/java/com/iformall/controller/datafix/DataInitController.java View File

@@ -203,7 +203,7 @@ public class DataInitController extends BaseController {
creditHistory.setOperatorId(buUser.getId());
creditHistory.setCUserId(co.getcUserId());
creditHistory.setCreateDate(co.getUpdateDate());
creditHistory.setTenantId(co.getTenantId());
creditHistory.setTenantId(co.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setCouponId(coupon.getId());
creditHistory.setBusinessId(coupon.getBusiness());


Loading…
Cancel
Save