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

Merge branch 'release_toaliyun_real' into aliyun_real_xhxu

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
8912e4e6b7
3 измененных файлов: 20 добавлений и 1 удалений
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  2. +5
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java
  3. +12
    -0
      mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -115,6 +115,9 @@ public class TenantInfoImpl implements TenantInfo {
if ("wx_c_user".equals(tableName)) { if ("wx_c_user".equals(tableName)) {
return true; return true;
} }
if ("wx_c_user_basic_info".equals(tableName)) {
return true;
}
if ("wx_c_user_car".equals(tableName)) { if ("wx_c_user_car".equals(tableName)) {
return true; return true;
} }


+ 5
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java Просмотреть файл

@@ -73,7 +73,11 @@ public class CouponOrderExpiringSchedule {
List<WxCouponOrder> list = wxCouponOrderMapper.findExpiredCouponOrderByValidDate(); List<WxCouponOrder> list = wxCouponOrderMapper.findExpiredCouponOrderByValidDate();
CouponOrderExpiringSchedule proxy = (CouponOrderExpiringSchedule) AopContext.currentProxy(); CouponOrderExpiringSchedule proxy = (CouponOrderExpiringSchedule) AopContext.currentProxy();
list.stream().forEach(co -> { list.stream().forEach(co -> {
proxy.refund(co);
try {
proxy.refund(co);
}catch(Exception e) {
logger.error(e.getMessage());
}
}); });
} }




+ 12
- 0
mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java Просмотреть файл

@@ -158,6 +158,7 @@ public class OrderExpiringSchedule {
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode());
wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> {
try { try {
proxy.orderGroupBreak((WxOrder) o);
proxy.returnMoney((WxOrder) o); proxy.returnMoney((WxOrder) o);
} catch (Exception e) { } catch (Exception e) {
logger.error("拼团券下架退款失败" + e.getMessage()); logger.error("拼团券下架退款失败" + e.getMessage());
@@ -304,6 +305,17 @@ public class OrderExpiringSchedule {
wxOrderService.orderClose(updateOrder); wxOrderService.orderClose(updateOrder);
logger.info("拼团订单: " + order.getId() + " create at " + order.getCreateDate() + " expired at " + curDate); logger.info("拼团订单: " + order.getId() + " create at " + order.getCreateDate() + " expired at " + curDate);
} }
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public void orderGroupBreak(WxOrder order) {
Date curDate = new Date();
WxOrder updateOrder = new WxOrder();
updateOrder.setId(order.getId());
updateOrder.updateTenantInfo(order);
updateOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode());
updateOrder.setUpdateDate(curDate);
wxOrderMapper.updateById(updateOrder);
}


/** /**
* 回调会再次扣减库存 * 回调会再次扣减库存


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