Просмотр исходного кода

[卡][修改]:卡领取免费

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
4de702b111
2 измененных файлов: 34 добавлений и 16 удалений
  1. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  2. +23
    -16
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Просмотреть файл

@@ -276,4 +276,15 @@ public class WxCoupon extends BaseEntity {
return false;
}

public boolean checkIsFree() {
if(salePrice!= null) {
if (salePrice.equals(0)) {
return true;
} else {
return false;
}
}
return false;
}

}

+ 23
- 16
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Просмотреть файл

@@ -693,30 +693,37 @@ public class WxOrderServiceImpl implements WxOrderService {
/// 储值卡信息添加
if (isCard) {
WxPayOrder payOrder = null;
try {
WxPayOrder payOrderQ = new WxPayOrder();
payOrderQ.setTenantId(user.getTenantId());
payOrderQ.setOrderId(order.getId());
payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
payOrder = wxPayOrderMapper.selectOne(new QueryWrapper(payOrderQ));
} catch (Exception e) {
logger.error("payOrder not found:" + e.getMessage());
}

Integer fee = payOrder.getPayAmount() - payOrder.getShareAmount();

Integer fee = 0;
WxCardInfo cardInfo = new WxCardInfo();
cardInfo.setId(couponOrder.getId());
cardInfo.setTenantId(user.getTenantId());
cardInfo.setCouponId(order.getProductId());
cardInfo.setTransactionId(payOrder.getTransactionId());
cardInfo.setAmount(coupon.getPrice());
cardInfo.setSaleAmount(coupon.getSalePrice());
cardInfo.setRemainingAmount(coupon.getPrice());

if (!coupon.checkIsFree()) {
try {
WxPayOrder payOrderQ = new WxPayOrder();
payOrderQ.setTenantId(user.getTenantId());
payOrderQ.setOrderId(order.getId());
payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
payOrder = wxPayOrderMapper.selectOne(new QueryWrapper(payOrderQ));
} catch (Exception e) {
logger.error("payOrder not found:" + e.getMessage());
}
fee = payOrder.getPayAmount() - payOrder.getShareAmount();
cardInfo.setTransactionId(payOrder.getTransactionId());
cardInfo.setShareFeeAmount(payOrder.getShareAmount());
cardInfo.setRemainingShareFeeAmount(payOrder.getShareAmount());
cardInfo.setRateAmount(payOrder.getRateAmount());
} else {
cardInfo.setShareFeeAmount(0);
cardInfo.setRemainingShareFeeAmount(0);
cardInfo.setRateAmount(0);
}

cardInfo.setServiceFeeAmount(fee);
cardInfo.setShareFeeAmount(payOrder.getShareAmount());
cardInfo.setRemainingShareFeeAmount(payOrder.getShareAmount());
cardInfo.setRateAmount(payOrder.getRateAmount());
cardInfo.setCreateDate(curr);
cardInfo.setUpdateDate(curr);
cardInfo.setSupportTransfer(coupon.getSupportTransfer());


Загрузка…
Отмена
Сохранить