Sfoglia il codice sorgente

fix wx_coupon_order分表

release_toaliyun_real
xiaohanzi 5 anni fa
parent
commit
51e95a46f9
10 ha cambiato i file con 19 aggiunte e 14 eliminazioni
  1. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java
  2. +1
    -1
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  3. +1
    -0
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
  5. +2
    -1
      mallinkService/src/main/java/com/iformall/service/WxGameService.java
  6. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  7. +6
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  8. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java
  9. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
  10. +1
    -1
      mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java

+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java Vedi File

@@ -72,7 +72,7 @@ public class WxGameController extends BaseController {
try {
Long gameIdL = Long.valueOf(paramMap.get("gameId"));
Long orderIdL = Long.valueOf(paramMap.get("orderId"));
return wxGameService.addActionLog(getMemberId(), gameIdL, orderIdL);
return wxGameService.addActionLog(getMemberId(), gameIdL, orderIdL,getTenantInfo());
} catch (Exception e){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
}


+ 1
- 1
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Vedi File

@@ -295,7 +295,7 @@ public class PosServiceImpl implements PosService {
logger.error(e.getMessage());
throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), e.getMessage());
}
WxCouponOrder couponOrder = couponOrderMapper.selectById(cardId);
WxCouponOrder couponOrder = couponOrderMapper.selectById(cardId,merchant.getTenantId());
if (couponOrder == null) {
throw new MallinkException(ErrorCode.CARD_IS_NOT_FOUND);
}


+ 1
- 0
mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java Vedi File

@@ -117,6 +117,7 @@ public class CouponOrderExpiringSchedule {
updateRecord.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_OVER_TIME.getCode()); //券已过期
}
updateRecord.setUpdateDate(new Date());
updateRecord.updateTenantInfo(co);
wxCouponOrderMapper.updateById(updateRecord);

// 库存退回


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java Vedi File

@@ -213,6 +213,6 @@ public interface WxCouponOrderService {
/**
* 尚安停车
*/
Integer shangAnVerify(Long couponOrderId);
Integer shangAnVerify(Long couponOrderId,TenantEntity tenantinfo);

}

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/WxGameService.java Vedi File

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxGame;
import com.iformall.domain.po.WxGameActionLog;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumPayWay;

public interface WxGameService {
@@ -32,7 +33,7 @@ public interface WxGameService {
*/
WxGame getOneGame(WxGame record);

ResultData addActionLog(Long userId, Long gameId, Long orderId);
ResultData addActionLog(Long userId, Long gameId, Long orderId,TenantEntity tenantinfo);

ResultData getCount(Long gameId, Long userId);
/**


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

@@ -417,7 +417,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
// 卡已消费, 余额不为0
int remainShareFeeAmount = cardInfo.getRemainingShareFeeAmount();
try {
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(cardInfo.getId());
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(cardInfo.getId(),cardInfo.getTenantId());
// 更新 coupon order状态
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.CARD_RETURNED.getCode());
couponOrder.setUpdateDate(new Date());
@@ -474,7 +474,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
throw new MallinkException(ErrorCode.DB_FAIL);
}
// 分账时间检查
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(cardId);
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(cardId,tenantEntity.getTenantId());
if (couponOrder.getExpiredTime().before(new Date())) {
throw new MallinkException(ErrorCode.PROFIT_SHARING_TIME_EXPIRED);
}


+ 6
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Vedi File

@@ -154,7 +154,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {

@Override
public WxCouponOrder getById(Long id,String tenantId) {
return wxCouponOrderMapper.selectById(id);
return wxCouponOrderMapper.selectById(id,tenantId);
}

@Override
@@ -1451,10 +1451,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
updateCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode());
updateCouponOrder.setUpdateDate(new Date());
updateCouponOrder.setPayVendor(payWay.getCode());
updateCouponOrder.updateTenantInfo(bUser);
// 核销状态更新
int num = wxCouponOrderMapper.updateById(updateCouponOrder);
if (num == 1) {
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(couponOrderId);
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(couponOrderId,updateCouponOrder.getTenantId());
WxCoupon coupon = wxCouponMapper.selectById(couponOrder.getCouponId(),bUser.getTenantId());
doAfterVerify(couponOrder, bUser, coupon);
}
@@ -1463,15 +1464,16 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {

@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public Integer shangAnVerify(Long couponOrderId) {
public Integer shangAnVerify(Long couponOrderId,TenantEntity tenantinfo) {
WxCouponOrder updateCouponOrder = new WxCouponOrder();
updateCouponOrder.setId(couponOrderId);
updateCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode());
updateCouponOrder.setUpdateDate(new Date());
updateCouponOrder.updateTenantInfo(tenantinfo);
// 核销状态更新
int num = wxCouponOrderMapper.updateById(updateCouponOrder);
if (num == 1) {
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(couponOrderId);
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(couponOrderId,tenantinfo.getTenantId());
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(couponOrder.getcUserId(),couponOrder.getFinalTenantId());
WxCoupon coupon = wxCouponMapper.selectById(couponOrder.getCouponId(),couponOrder.getTenantId());
doAfterVerify(couponOrder, coupon, wxCUserBasicInfo);


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java Vedi File

@@ -10,6 +10,7 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxCouponCVo;
import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.EnumCouponChannelStatus;
@@ -113,12 +114,12 @@ public class WxGameServiceImpl implements WxGameService {


@Override
public ResultData addActionLog(Long userId, Long gameId, Long orderId) {
public ResultData addActionLog(Long userId, Long gameId, Long orderId,TenantEntity tenantinfo) {

WxCouponOrder wxCouponOrder = new WxCouponOrder();
wxCouponOrder.setCUserId(userId);
wxCouponOrder.setOrderId(orderId);
wxCouponOrder.updateTenantInfo(tenantinfo);
if (orderId != 0) {
try {
wxCouponOrder = wxCouponOrderMapper.selectOne(new QueryWrapper(wxCouponOrder));


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java Vedi File

@@ -123,7 +123,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public ResultData createRefundOrder(WxAppinfo appInfo, Long couponOrderId, EnumPayType payType, Long bUserId) {
WxCouponOrder wxCouponOrder = wxCouponOrderMapper.selectById(couponOrderId);
WxCouponOrder wxCouponOrder = wxCouponOrderMapper.selectById(couponOrderId,appInfo.getTenantId());
if (wxCouponOrder == null) {
logger.error("券ID不存在:" + couponOrderId);
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java Vedi File

@@ -72,7 +72,7 @@ public class ShangAnParkService extends BaseParkService implements ParkAdapterSe
if (retObj.getString(ShangAnUtil.SHANGAN_STATUS).equalsIgnoreCase(ShangAnUtil.SHANGAN_SUCCESS)) {
// 停车券-核销
try {
wxCouponOrderService.shangAnVerify(userCar.getId());
wxCouponOrderService.shangAnVerify(userCar.getId(),park);
} catch (Exception e) {
logger.error(e.getMessage());
}


Caricamento…
Annulla
Salva