Browse Source

fix order

release_toaliyun_real
xiaohanzi 4 years ago
parent
commit
5f72dcffbb
2 changed files with 6 additions and 2 deletions
  1. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  2. +5
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java

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

@@ -103,7 +103,7 @@ public class WxMicroPayController extends BaseController {

WxPayOrder record = new WxPayOrder();
record.updateTenantInfo(user);
record.setOrderId(order.getId());
record.setOrderId(EnumComposeOrder.getPayOrderId(order));
record.setAuthCode(authCode);
record.setPayAmount(order.getPayment());
record.setIp(ipStr);


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

@@ -162,7 +162,11 @@ public class CouponOrderExpiringSchedule {
try {
WxPayOrder wxPayOrder = new WxPayOrder();
wxPayOrder.updateTenantInfo(co);
wxPayOrder.setOrderId(co.getOrderId());
Long orderId = co.getOrderId();
if (!EnumComposeOrder.isSingle(co.getComposeOrderType())) {
orderId = co.getComposeOrderId();
}
wxPayOrder.setOrderId(orderId);
wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder));
if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) {


Loading…
Cancel
Save