Browse Source

拼团bug

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
eac2582367
3 changed files with 7 additions and 4 deletions
  1. +2
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java
  3. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java

+ 2
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java View File

@@ -193,7 +193,8 @@ public class WxPayOrderController extends BaseController {
//拼团的订单,如果查询到是拼团待付款的,则重新查询是否已经真的支付,其他的直接返回订单信息
if (wxPayOrderService.isOrderGroupCoupon(payOrder, wxCoupon)) {
if (order.getOrderStatus()!=EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()) {
if (order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()) ||
order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode())) {
return new ResultData(Result.SUCCESS, "支付状态更新成功", order);
}
}else {


+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java View File

@@ -25,7 +25,7 @@ public enum EnumOrderStatus {
ORDER_STATUS_COOPERATING_UNPAID(15, "拼团待付款"),//占库存
ORDER_STATUS_COOPERATING_BREAK(16, "拼团取消"),
ORDER_STATUS_COOPERATING_SCHEDU_REFUND(99,"订单定时状态-需要返款和回滚库存,无需再次查询真实支付状态"),
ORDER_STATUS_COOPERATING_COMPLETE_REFUND(98,"拼团完成会,未有效的订单统一置成该状态")
ORDER_STATUS_COOPERATING_COMPLETE_REFUND(98,"拼团完成会更新未支付的为此状态,未有效的订单统一置成该状态")
;
public static EnumOrderStatus getEnum(Integer code) {


+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java View File

@@ -135,9 +135,11 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
//此处不要抛出异常,会导致事务回滚,状态写不上
return;
}else {
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode());
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE_REFUND.getCode());
wxOrderMapper.updateById(order);
throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD.getCode(),"参团人数已满,将稍后退款。");
//此处不要抛出异常,会导致事务回滚,状态写不上
//throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD.getCode(),"参团人数已满,将稍后退款。");
return;
}
}


Loading…
Cancel
Save