|
|
@@ -452,7 +452,7 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
|
|
|
|
|
|
// 更新的中间表id
|
|
|
List<Integer> updateIds = orderCouponMiddles1.stream().limit(refundCouponAmount).map(x -> x.getId()).collect(Collectors.toList());
|
|
|
- if (result.equals("调用失败")) {
|
|
|
+ if (!result.equals("调用成功")) {
|
|
|
refundMessage = "编号为" + order.getOrderNo() + "的订单退款失败,请重新发起申请。";
|
|
|
// TODO 退款失败目前不做处理
|
|
|
/*orderCouponMiddleMapper.update(null,new UpdateWrapper<OrderCouponMiddle>().in("id",updateIds)
|
|
|
@@ -1135,7 +1135,11 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
|
|
|
// 状态(0草稿/1待审核/2未开始/3审核拒绝/4已售罄/5进行中/6已下架/7已结束/8=2+手动下架)
|
|
|
if (status != CouponStatusEnum.ONGOING.getCode()) {
|
|
|
returnMap.put("success", false);
|
|
|
- returnMap.put("reason", "团购/代金券未开始");
|
|
|
+ if( status == CouponStatusEnum.SOLD_OUT.getCode()){
|
|
|
+ returnMap.put("reason", "团购/代金券已售罄");
|
|
|
+ }else{
|
|
|
+ returnMap.put("reason", "团购/代金券未开始");
|
|
|
+ }
|
|
|
return returnMap;
|
|
|
}
|
|
|
// 限购
|