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

[拼团][修改][参团失败问题]

release_toaliyun_real
gongbiao пре 7 година
родитељ
комит
6dd1b216f4
2 измењених фајлова са 9 додато и 10 уклоњено
  1. +1
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
  2. +8
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java

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

@@ -218,8 +218,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
return o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()) || return o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()) ||
o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()) || o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()) ||
o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()) || o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()) ||
o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()) ||
o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode());
o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode());
}).sorted(Comparator.comparing(order -> order.getId())).collect(Collectors.toList()); }).sorted(Comparator.comparing(order -> order.getId())).collect(Collectors.toList());
if (!orderList.isEmpty()) { if (!orderList.isEmpty()) {
List<WxCUser> userList = new ArrayList<>(); List<WxCUser> userList = new ArrayList<>();


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

@@ -1337,14 +1337,14 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(orderId); WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(orderId);
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
Date currentDate = new Date(); Date currentDate = new Date();
wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode());
wxOrder.setUpdateDate(currentDate);
try {
wxOrderMapper.updateByPrimaryKeySelective(wxOrder);
} catch (Exception e) {
logger.error("订单修改出错: " + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单修改出错");
}
// wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode());
// wxOrder.setUpdateDate(currentDate);
// try {
// wxOrderMapper.updateByPrimaryKeySelective(wxOrder);
// } catch (Exception e) {
// logger.error("订单修改出错: " + e.getMessage());
// throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单修改出错");
// }


// 查找支付订单 // 查找支付订单
WxPayOrder payOrderQ = new WxPayOrder(); WxPayOrder payOrderQ = new WxPayOrder();


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