Преглед изворни кода

/。 wxpayorder-orderId-getComposeOrderId()

release_toaliyun_real
xhxu пре 4 година
родитељ
комит
c874d3a620
4 измењених фајлова са 19 додато и 19 уклоњено
  1. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  2. +5
    -5
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java
  3. +12
    -12
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java Прегледај датотеку

@@ -492,7 +492,7 @@ public class WxMicroPayController extends BaseController {
// record.setIp(ipStr);

WxPayOrder qpo = new WxPayOrder();
qpo.setOrderId(microOrder.getId());
qpo.setOrderId(microOrder.getComposeOrderId());
qpo.updateTenantInfo(getTenantInfo());
WxPayOrder po = wxPayOrderService.getByObj(qpo);
if (null == po) {


+ 5
- 5
mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java Прегледај датотеку

@@ -202,11 +202,11 @@ public class CouponOrderExpiringSchedule {
try {
WxPayOrder wxPayOrder = new WxPayOrder();
wxPayOrder.updateTenantInfo(co);
Long orderId = co.getOrderId();
if (!EnumComposeOrder.isSingle(co.getComposeOrderType())) {
orderId = co.getComposeOrderId();
}
wxPayOrder.setOrderId(orderId);
// Long orderId = co.getOrderId();
// if (!EnumComposeOrder.isSingle(co.getComposeOrderType())) {
// orderId = co.getComposeOrderId();
// }
wxPayOrder.setOrderId(co.getComposeOrderId());
wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder));



+ 12
- 12
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Прегледај датотеку

@@ -1548,12 +1548,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {

//TODO (系统设置不分账抖音也需要分账)抖音先记账, 定时去处理分账业务
WxPayOrder wxPayOrder = new WxPayOrder();
Long orderId = couponOrder.getOrderId();
if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) {
orderId = couponOrder.getComposeOrderId();
}
// Long orderId = couponOrder.getOrderId();
// if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) {
// orderId = couponOrder.getComposeOrderId();
// }
wxPayOrder.updateTenantInfo(couponOrder);
wxPayOrder.setOrderId(orderId);
wxPayOrder.setOrderId(couponOrder.getComposeOrderId());
wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder));

@@ -1668,14 +1668,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
// 微信分账
try {
WxPayOrder wxPayOrder = new WxPayOrder();
Long orderId = couponOrder.getOrderId();
if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) {
orderId = couponOrder.getComposeOrderId();
}
// Long orderId = couponOrder.getOrderId();
//
// if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) {
// orderId = couponOrder.getComposeOrderId();
// }
wxPayOrder.updateTenantInfo(couponOrder);
wxPayOrder.setOrderId(orderId);
wxPayOrder.setOrderId(couponOrder.getComposeOrderId());
wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder));
if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) {
@@ -2640,7 +2640,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
payOrder.setId(payOrderId);
payOrder.updateTenantInfo(composeOrder.getSingleOrder());
payOrder.setCUserId(composeOrder.getSingleOrder().getCUserId());
payOrder.setOrderId(composeOrder.getSingleOrder().getId());
payOrder.setOrderId(composeOrder.getSingleOrder().getComposeOrderId());
payOrder.setCreateTime(curDate);
payOrder.setUpdateTime(curDate);
payOrder.setPayTimeStart(curDate);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java Прегледај датотеку

@@ -460,7 +460,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
WxPayOrder payOrderQ = new WxPayOrder();
payOrderQ.updateTenantInfo(wxOrder);
payOrderQ.setCUserId(wxOrder.getCUserId());
payOrderQ.setOrderId(wxOrder.getId());
payOrderQ.setOrderId(wxOrder.getComposeOrderId());
payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());

WxPayOrder payOrder = null;


Loading…
Откажи
Сачувај