| @@ -237,7 +237,13 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { | |||||
| wxOrder.setOrderGroupId(group.getId()); | wxOrder.setOrderGroupId(group.getId()); | ||||
| List<WxOrder> list = wxOrderMapper.findList(wxOrder); | List<WxOrder> list = wxOrderMapper.findList(wxOrder); | ||||
| for (WxOrder temp : list) { | for (WxOrder temp : list) { | ||||
| WxRefundOrderService.returnMoney(appinfo, temp.getId()); | |||||
| if (!temp.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode())) { | |||||
| ResultData resultData = WxRefundOrderService.returnMoney(appinfo, temp.getId()); | |||||
| if (resultData.code == ResultData.SUCCESS) { | |||||
| temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); | |||||
| wxOrderMapper.updateByPrimaryKeySelective(order); | |||||
| } | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -69,7 +69,7 @@ | |||||
| select o.id orderId,o.order_status orderStatus,o.order_group_id orderGroupId,c.title,c.sub_title subTitle, | select o.id orderId,o.order_status orderStatus,o.order_group_id orderGroupId,c.title,c.sub_title subTitle, | ||||
| c.sale_price salePrice,c.cover_img coverImg,g.remain_people remainPeople,c.id couponId,g.expired_date | c.sale_price salePrice,c.cover_img coverImg,g.remain_people remainPeople,c.id couponId,g.expired_date | ||||
| expiredDate, | |||||
| expiredDate,g.status, | |||||
| g.user_id firstUser,u.nick_name nickName,u.avatar_url avatarUrl | g.user_id firstUser,u.nick_name nickName,u.avatar_url avatarUrl | ||||
| from wx_order o | from wx_order o | ||||
| left join wx_coupon c on o.product_id=c.id | left join wx_coupon c on o.product_id=c.id | ||||