Bläddra i källkod

xingxingdiandeng

release_toaliyun_real
xhxu 5 år sedan
förälder
incheckning
72b55aa187
20 ändrade filer med 36 tillägg och 0 borttagningar
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  2. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java
  3. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java
  4. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  5. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  6. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java
  7. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  8. +4
    -0
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  9. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java
  10. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  11. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  12. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  13. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  14. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
  15. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  16. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java
  17. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java
  18. +1
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java
  19. +3
    -0
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
  20. +1
    -0
      mallinkSysAdmin/src/main/java/com/iformall/controller/datafix/DataInitController.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java Visa fil

@@ -81,6 +81,7 @@ public class WxCreditHistoryController extends BaseController {
MallUserInfo user = getUser(); MallUserInfo user = getUser();
//wxCreditHistory.updateTenantInfo(user); //wxCreditHistory.updateTenantInfo(user);
wxCreditHistory.setTenantId(user.getFinalTenantId()); wxCreditHistory.setTenantId(user.getFinalTenantId());
wxCreditHistory.setFinalTenantId(user.getFinalTenantId());
wxCreditHistory.setOperatorId(user.getId()); wxCreditHistory.setOperatorId(user.getId());
try { try {
wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),getTenantInfo()) ; wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),getTenantInfo()) ;


+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java Visa fil

@@ -41,6 +41,7 @@ public class WxScoreHistoryController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxScoreHistoryController::list"); logger.debug("[" + getIpAddr() + "] WxScoreHistoryController::list");
if (null == wxScoreHistory) wxScoreHistory = new WxScoreHistory(); if (null == wxScoreHistory) wxScoreHistory = new WxScoreHistory();
wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId());
wxScoreHistory.setFinalTenantId(getTenantInfo().getFinalTenantId());
final PageInfo<WxScoreHistory> page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); final PageInfo<WxScoreHistory> page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }
@@ -56,6 +57,7 @@ public class WxScoreHistoryController extends BaseController {
return new ResultData(ErrorCode.MEMBER_IS_LOCKED); return new ResultData(ErrorCode.MEMBER_IS_LOCKED);
} }
wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId());
wxScoreHistory.setFinalTenantId(getTenantInfo().getFinalTenantId());
wxScoreHistoryService.saveOrUpdate(wxScoreHistory); wxScoreHistoryService.saveOrUpdate(wxScoreHistory);
return new ResultData(); return new ResultData();
} }
@@ -69,6 +71,7 @@ public class WxScoreHistoryController extends BaseController {
return new ResultData(ErrorCode.MEMBER_IS_LOCKED); return new ResultData(ErrorCode.MEMBER_IS_LOCKED);
} }
wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId());
wxScoreHistory.setFinalTenantId(getTenantInfo().getFinalTenantId());
wxScoreHistoryService.saveOrUpdate(wxScoreHistory); wxScoreHistoryService.saveOrUpdate(wxScoreHistory);
return new ResultData(); return new ResultData();
} }


+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java Visa fil

@@ -194,6 +194,7 @@ public class WxCUserController extends BaseController {
wxCreditHistory.setCUserId(wxCUserBasicInfo.getId()); wxCreditHistory.setCUserId(wxCUserBasicInfo.getId());
// wxCreditHistory.updateTenantInfo(tenantEntity); // wxCreditHistory.updateTenantInfo(tenantEntity);
wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId()); wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId());
wxCreditHistory.setFinalTenantId(getTenantInfo().getFinalTenantId());
wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreateDate(new Date());
wxCreditHistory.setCreditType(enumScoreType.getCode()); wxCreditHistory.setCreditType(enumScoreType.getCode());
wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode());


+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java Visa fil

@@ -102,6 +102,7 @@ public class WxCreditHistoryController extends BaseController {
// wxCreditHistory.updateTenantInfo(getTenantInfo()); // wxCreditHistory.updateTenantInfo(getTenantInfo());
TenantEntity tenantInfo = getTenantInfo(); TenantEntity tenantInfo = getTenantInfo();
wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId()); wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId());
wxCreditHistory.setFinalTenantId(getTenantInfo().getFinalTenantId());
wxCreditHistory.setOperatorId(getLoginBUser().getId()); wxCreditHistory.setOperatorId(getLoginBUser().getId());
WxMerchant wxMerchant = new WxMerchant(); WxMerchant wxMerchant = new WxMerchant();
wxMerchant.setId(getLoginBUser().getMerchantId()); wxMerchant.setId(getLoginBUser().getMerchantId());


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java Visa fil

@@ -46,6 +46,7 @@ public class WxCreditHistoryController extends BaseController{
} catch (Exception e) { } catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage()); return new ResultData(Result.ERROR,e.getMessage());
} }
wxCreditHistory.setFinalTenantId(getTenantInfo().getFinalTenantId());
wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId());
wxCreditHistory.setCUserId(memberId); wxCreditHistory.setCUserId(memberId);
wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC);


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxScoreHistoryController.java Visa fil

@@ -33,6 +33,7 @@ public class WxScoreHistoryController extends BaseController {
WxScoreHistory wxScoreHistory = new WxScoreHistory(); WxScoreHistory wxScoreHistory = new WxScoreHistory();
// wxScoreHistory.updateTenantInfo(getTenantInfo()); // wxScoreHistory.updateTenantInfo(getTenantInfo());
wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId());
wxScoreHistory.setFinalTenantId(getTenantInfo().getFinalTenantId());
Long memberId; Long memberId;
try { try {
memberId = getMemberId(); memberId = getMemberId();


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Visa fil

@@ -972,6 +972,7 @@ public class WxUserGrantController extends BaseController {
wxCreditHistory.setCUserId(record.getId()); wxCreditHistory.setCUserId(record.getId());
// wxCreditHistory.updateTenantInfo(tenantEntity); // wxCreditHistory.updateTenantInfo(tenantEntity);
wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId()); wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId());
wxCreditHistory.setFinalTenantId(tenantEntity.getFinalTenantId());
wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreateDate(new Date());
wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode());
wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode());


+ 4
- 0
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Visa fil

@@ -1365,6 +1365,7 @@ public class PosServiceImpl implements PosService {
creditHistory.setCreateDate(new Date()); creditHistory.setCreateDate(new Date());
// creditHistory.updateTenantInfo(couponOrderCVo); // creditHistory.updateTenantInfo(couponOrderCVo);
creditHistory.setTenantId(couponOrderCVo.getFinalTenantId()); creditHistory.setTenantId(couponOrderCVo.getFinalTenantId());
creditHistory.setFinalTenantId(couponOrderCVo.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setCouponId(couponOrderCVo.getCouponId()); creditHistory.setCouponId(couponOrderCVo.getCouponId());
creditHistory.setBusinessId(coupon.getBusiness()); creditHistory.setBusinessId(coupon.getBusiness());
@@ -1393,6 +1394,7 @@ public class PosServiceImpl implements PosService {
creditHistory.setCreateDate(new Date()); creditHistory.setCreateDate(new Date());
// creditHistory.updateTenantInfo(merchant); // creditHistory.updateTenantInfo(merchant);
creditHistory.setTenantId(merchant.getFinalTenantId()); creditHistory.setTenantId(merchant.getFinalTenantId());
creditHistory.setFinalTenantId(merchant.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setBusinessId(merchant.getBusinessId()); creditHistory.setBusinessId(merchant.getBusinessId());
creditHistory.setSpend(payment); creditHistory.setSpend(payment);
@@ -1424,6 +1426,7 @@ public class PosServiceImpl implements PosService {
creditHistory.setOperatorId(buUserId); creditHistory.setOperatorId(buUserId);
creditHistory.setCUserId(couponOrderCVo.getcUserId()); creditHistory.setCUserId(couponOrderCVo.getcUserId());
// creditHistory.updateTenantInfo(couponOrderCVo); // creditHistory.updateTenantInfo(couponOrderCVo);
creditHistory.setFinalTenantId(couponOrderCVo.getFinalTenantId());
creditHistory.setTenantId(couponOrderCVo.getFinalTenantId()); creditHistory.setTenantId(couponOrderCVo.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setCouponId(couponOrderCVo.getCouponId()); creditHistory.setCouponId(couponOrderCVo.getCouponId());
@@ -1441,6 +1444,7 @@ public class PosServiceImpl implements PosService {
WxScoreHistory scoreHistory = new WxScoreHistory(); WxScoreHistory scoreHistory = new WxScoreHistory();
// scoreHistory.updateTenantInfo(couponOrderCVo); // scoreHistory.updateTenantInfo(couponOrderCVo);
scoreHistory.setTenantId(couponOrderCVo.getFinalTenantId()); scoreHistory.setTenantId(couponOrderCVo.getFinalTenantId());
scoreHistory.setFinalTenantId(couponOrderCVo.getFinalTenantId());
scoreHistory.setScoreType(EnumScoreType.CONSUMPTION.getCode()); scoreHistory.setScoreType(EnumScoreType.CONSUMPTION.getCode());
scoreHistory.setCUserId(couponOrderCVo.getcUserId()); scoreHistory.setCUserId(couponOrderCVo.getcUserId());
scoreHistory.setOrderId(couponOrderCVo.getOrderId()); scoreHistory.setOrderId(couponOrderCVo.getOrderId());


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java Visa fil

@@ -183,6 +183,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
WxCreditHistory wxCreditHistory = new WxCreditHistory(); WxCreditHistory wxCreditHistory = new WxCreditHistory();
// wxCreditHistory.updateTenantInfo(wxActivity); // wxCreditHistory.updateTenantInfo(wxActivity);
wxCreditHistory.setTenantId(wxActivity.getFinalTenantId()); wxCreditHistory.setTenantId(wxActivity.getFinalTenantId());
wxCreditHistory.setFinalTenantId(wxActivity.getFinalTenantId());
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());


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java Visa fil

@@ -1073,6 +1073,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
WxCreditHistory wxCreditHistory = new WxCreditHistory(); WxCreditHistory wxCreditHistory = new WxCreditHistory();
// wxCreditHistory.updateTenantInfo(mallUserInfo); // wxCreditHistory.updateTenantInfo(mallUserInfo);
wxCreditHistory.setTenantId(mallUserInfo.getFinalTenantId()); wxCreditHistory.setTenantId(mallUserInfo.getFinalTenantId());
wxCreditHistory.setFinalTenantId(mallUserInfo.getFinalTenantId());
wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreateDate(new Date());
if (mallUserInfo != null) { if (mallUserInfo != null) {
wxCreditHistory.setOperatorId(mallUserInfo.getId()); wxCreditHistory.setOperatorId(mallUserInfo.getId());


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java Visa fil

@@ -338,6 +338,7 @@ public class WxCUserServiceImpl implements WxCUserService {
WxCreditHistory wxCreditHistory = new WxCreditHistory(); WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setCUserId(user.getUserId()); wxCreditHistory.setCUserId(user.getUserId());
wxCreditHistory.setTenantId(user.getFinalTenantId()); wxCreditHistory.setTenantId(user.getFinalTenantId());
wxCreditHistory.setFinalTenantId(user.getFinalTenantId());
wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreateDate(new Date());
wxCreditHistory.setCreditType(enumScoreType.getCode()); wxCreditHistory.setCreditType(enumScoreType.getCode());
wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode());


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java Visa fil

@@ -304,6 +304,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
creditHistory.setCreateDate(new Date()); creditHistory.setCreateDate(new Date());
// creditHistory.updateTenantInfo(record); // creditHistory.updateTenantInfo(record);
creditHistory.setTenantId(record.getFinalTenantId()); creditHistory.setTenantId(record.getFinalTenantId());
creditHistory.setFinalTenantId(record.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setBusinessId(coupon.getBusiness()); creditHistory.setBusinessId(coupon.getBusiness());
creditHistory.setSpend(real_payment); creditHistory.setSpend(real_payment);
@@ -924,6 +925,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
creditHistory.setCreateDate(new Date()); creditHistory.setCreateDate(new Date());
// creditHistory.updateTenantInfo(record); // creditHistory.updateTenantInfo(record);
creditHistory.setTenantId(record.getFinalTenantId()); creditHistory.setTenantId(record.getFinalTenantId());
creditHistory.setFinalTenantId(record.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setBusinessId(merchant.getBusinessId()); creditHistory.setBusinessId(merchant.getBusinessId());
creditHistory.setSpend(record.getRealPayment()); creditHistory.setSpend(record.getRealPayment());


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Visa fil

@@ -447,6 +447,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
creditHistory.setCreateDate(new Date()); creditHistory.setCreateDate(new Date());
// creditHistory.updateTenantInfo(couponOrder); // creditHistory.updateTenantInfo(couponOrder);
creditHistory.setTenantId(couponOrder.getFinalTenantId()); creditHistory.setTenantId(couponOrder.getFinalTenantId());
creditHistory.setFinalTenantId(couponOrder.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setCouponId(wxCoupon.getId()); creditHistory.setCouponId(wxCoupon.getId());
creditHistory.setBusinessId(wxCoupon.getBusiness()); creditHistory.setBusinessId(wxCoupon.getBusiness());
@@ -479,6 +480,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
creditHistory.setCreateDate(new Date()); creditHistory.setCreateDate(new Date());
// creditHistory.updateTenantInfo(couponOrder); // creditHistory.updateTenantInfo(couponOrder);
creditHistory.setTenantId(couponOrder.getFinalTenantId()); creditHistory.setTenantId(couponOrder.getFinalTenantId());
creditHistory.setFinalTenantId(couponOrder.getFinalTenantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setCouponId(wxCoupon.getId()); creditHistory.setCouponId(wxCoupon.getId());
creditHistory.setBusinessId(wxCoupon.getBusiness()); creditHistory.setBusinessId(wxCoupon.getBusiness());


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java Visa fil

@@ -322,6 +322,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
wxCreditHistory.setBusinessId(wxMerchant.getBusinessId()); wxCreditHistory.setBusinessId(wxMerchant.getBusinessId());
//wxCreditHistory.updateTenantInfo(tenantEntity); //wxCreditHistory.updateTenantInfo(tenantEntity);
wxCreditHistory.setTenantId(tenantId); wxCreditHistory.setTenantId(tenantId);
wxCreditHistory.setFinalTenantId(tenantId);
int credit; int credit;
int creditNew = 0 ; int creditNew = 0 ;
if (StringUtils.isNotBlank(spendStr)) { if (StringUtils.isNotBlank(spendStr)) {
@@ -420,6 +421,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
private int checkCompleteInfoScoreCount(WxCUserBasicInfo cUser) { private int checkCompleteInfoScoreCount(WxCUserBasicInfo cUser) {
WxCreditHistory wxCreditHistory = new WxCreditHistory(); WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setTenantId(cUser.getFinalTenantId()); wxCreditHistory.setTenantId(cUser.getFinalTenantId());
wxCreditHistory.setFinalTenantId(cUser.getFinalTenantId());
wxCreditHistory.setCUserId(cUser.getId()); wxCreditHistory.setCUserId(cUser.getId());
wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode());
return wxCreditHistoryMapper.countList(wxCreditHistory); return wxCreditHistoryMapper.countList(wxCreditHistory);


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Visa fil

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


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java Visa fil

@@ -312,6 +312,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
scoreHistory.setCUserId(cUser.getId()); scoreHistory.setCUserId(cUser.getId());
scoreHistory.setScoreType(EnumScoreType.LOGIN.getCode()); scoreHistory.setScoreType(EnumScoreType.LOGIN.getCode());
scoreHistory.setTenantId(tenantinfo.getFinalTenantId()); scoreHistory.setTenantId(tenantinfo.getFinalTenantId());
scoreHistory.setFinalTenantId(tenantinfo.getFinalTenantId());
return wxScoreHistoryMapper.countTodayList(scoreHistory); return wxScoreHistoryMapper.countTodayList(scoreHistory);
} }


@@ -446,6 +447,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
scoreHistory.setCUserId(user.getId()); scoreHistory.setCUserId(user.getId());
scoreHistory.setScoreType(EnumScoreType.COMPLETE_INFO.getCode()); scoreHistory.setScoreType(EnumScoreType.COMPLETE_INFO.getCode());
scoreHistory.setTenantId(tenantinfo.getFinalTenantId()); scoreHistory.setTenantId(tenantinfo.getFinalTenantId());
scoreHistory.setFinalTenantId(tenantinfo.getFinalTenantId());
return wxScoreHistoryMapper.countList(scoreHistory); return wxScoreHistoryMapper.countList(scoreHistory);
} }


@@ -502,6 +504,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
WxScoreHistory history = new WxScoreHistory(); WxScoreHistory history = new WxScoreHistory();
history.setId(idWorker.nextId()); history.setId(idWorker.nextId());
history.setTenantId(tenantEntity.getFinalTenantId()); history.setTenantId(tenantEntity.getFinalTenantId());
history.setFinalTenantId(tenantEntity.getFinalTenantId());
history.setCUserId(userInfo.getId()); history.setCUserId(userInfo.getId());
history.setCreateDate(new Date()); history.setCreateDate(new Date());
history.setScoreType(wechatPhone.getCode()); history.setScoreType(wechatPhone.getCode());
@@ -514,6 +517,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
WxScoreHistory history = new WxScoreHistory(); WxScoreHistory history = new WxScoreHistory();
history.setId(idWorker.nextId()); history.setId(idWorker.nextId());
history.setTenantId(tenantEntity.getFinalTenantId()); history.setTenantId(tenantEntity.getFinalTenantId());
history.setFinalTenantId(tenantEntity.getFinalTenantId());
history.setCUserId(id); history.setCUserId(id);
history.setCreateDate(new Date()); history.setCreateDate(new Date());
history.setScoreType(wechatPhone.getCode()); history.setScoreType(wechatPhone.getCode());
@@ -526,6 +530,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
WxScoreHistory history = new WxScoreHistory(); WxScoreHistory history = new WxScoreHistory();
history.setId(idWorker.nextId()); history.setId(idWorker.nextId());
history.setTenantId(order.getFinalTenantId()); history.setTenantId(order.getFinalTenantId());
history.setFinalTenantId(order.getFinalTenantId());
history.setCUserId(order.getCUserId()); history.setCUserId(order.getCUserId());
history.setCreateDate(new Date()); history.setCreateDate(new Date());
history.setScoreType(EnumScoreType.CONSUMPTION.getCode()); history.setScoreType(EnumScoreType.CONSUMPTION.getCode());
@@ -543,6 +548,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
WxScoreHistory history = new WxScoreHistory(); WxScoreHistory history = new WxScoreHistory();
history.setId(idWorker.nextId()); history.setId(idWorker.nextId());
history.setTenantId(tenantEntity.getFinalTenantId()); history.setTenantId(tenantEntity.getFinalTenantId());
history.setFinalTenantId(tenantEntity.getFinalTenantId());
history.setCUserId(id); history.setCUserId(id);
history.setCreateDate(new Date()); history.setCreateDate(new Date());
history.setScoreType(wechatPhone.getCode()); history.setScoreType(wechatPhone.getCode());


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java Visa fil

@@ -137,6 +137,7 @@ public class WxShopServiceImpl implements WxShopService {
} else { } else {
wxRentContract.setShopNumber(wxShop.getShopNumber());
List<WxRentContract> list = wxRentContractMapper.selectList(new QueryWrapper(wxRentContract)); List<WxRentContract> list = wxRentContractMapper.selectList(new QueryWrapper(wxRentContract));
// count = list.stream().filter(r -> !r.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && // count = list.stream().filter(r -> !r.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) &&
// !r.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) && // !r.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) &&


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java Visa fil

@@ -82,6 +82,7 @@ public class ParkHelper {
wxCreditHistory.setCUserId(cuUserId); wxCreditHistory.setCUserId(cuUserId);
// wxCreditHistory.updateTenantInfo(park); // wxCreditHistory.updateTenantInfo(park);
wxCreditHistory.setTenantId(park.getFinalTenantId()); wxCreditHistory.setTenantId(park.getFinalTenantId());
wxCreditHistory.setFinalTenantId(park.getFinalTenantId());
wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreateDate(new Date());
wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode()); wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode());
wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode());


+ 3
- 0
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Visa fil

@@ -132,6 +132,9 @@
<if test=" null != rentShopType and '' != rentShopType">and `rent_shop_type` = #{rentShopType}</if> <if test=" null != rentShopType and '' != rentShopType">and `rent_shop_type` = #{rentShopType}</if>
<if test=" null != operationType and '' != operationType">and `operation_type` = #{operationType}</if> <if test=" null != operationType and '' != operationType">and `operation_type` = #{operationType}</if>
<if test=" null != queryShopId and '' != queryShopId">and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"'))</if> <if test=" null != queryShopId and '' != queryShopId">and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"'))</if>
<if test=" null != shopNumber and shopNumber!=''">
and shop_name like concat('%',#{shopNumber},'%')
</if>
<if test=" null != statuss "> <if test=" null != statuss ">
and status in and status in
<foreach collection="statuss" index="index" item="statusItem" open="(" separator="," close=")"> <foreach collection="statuss" index="index" item="statusItem" open="(" separator="," close=")">


+ 1
- 0
mallinkSysAdmin/src/main/java/com/iformall/controller/datafix/DataInitController.java Visa fil

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


Laddar…
Avbryt
Spara