| @@ -13,6 +13,8 @@ public class WxRefundOrderP { | |||||
| private String out_refund_no; // 商户退款单号 | private String out_refund_no; // 商户退款单号 | ||||
| private Integer total_fee; // 支付金额 | private Integer total_fee; // 支付金额 | ||||
| private Integer refund_fee; // 退款金额 | private Integer refund_fee; // 退款金额 | ||||
| private String refund_desc; // 退款原因 | |||||
| private String notify_url; // 回调接口 | |||||
| public String getAppid() { | public String getAppid() { | ||||
| return appid; | return appid; | ||||
| @@ -86,6 +88,22 @@ public class WxRefundOrderP { | |||||
| this.refund_fee = refund_fee; | this.refund_fee = refund_fee; | ||||
| } | } | ||||
| public String getRefund_desc() { | |||||
| return refund_desc; | |||||
| } | |||||
| public void setRefund_desc(String refund_desc) { | |||||
| this.refund_desc = refund_desc; | |||||
| } | |||||
| public String getNotify_url() { | |||||
| return notify_url; | |||||
| } | |||||
| public void setNotify_url(String notify_url) { | |||||
| this.notify_url = notify_url; | |||||
| } | |||||
| @Override | @Override | ||||
| public String toString() { | public String toString() { | ||||
| final StringBuilder sb = new StringBuilder("WxRefundOrder{"); | final StringBuilder sb = new StringBuilder("WxRefundOrder{"); | ||||
| @@ -87,4 +87,6 @@ public interface WxOrderService { | |||||
| WxOrderCVo detailCUserVo(WxOrder record); | WxOrderCVo detailCUserVo(WxOrder record); | ||||
| void stockBack(WxOrder updateOrder); | |||||
| } | } | ||||
| @@ -15,6 +15,7 @@ import com.simple.enums.EnumCouponOrderStatus; | |||||
| import com.simple.exception.MallinkException; | import com.simple.exception.MallinkException; | ||||
| import com.simple.mapper.*; | import com.simple.mapper.*; | ||||
| import com.simple.service.WxCouponOrderService; | import com.simple.service.WxCouponOrderService; | ||||
| import com.simple.service.WxOrderService; | |||||
| import org.apache.log4j.Logger; | import org.apache.log4j.Logger; | ||||
| import org.apache.poi.ss.usermodel.Workbook; | import org.apache.poi.ss.usermodel.Workbook; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -48,6 +49,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| @Autowired | @Autowired | ||||
| WxCUserMapper wxCUserMapper; | WxCUserMapper wxCUserMapper; | ||||
| @Autowired | |||||
| WxOrderService wxOrderService; | |||||
| @Override | @Override | ||||
| public PageInfo<WxCouponOrder> listAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxCouponOrder> listAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { | ||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findList(record)); | return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findList(record)); | ||||
| @@ -369,6 +373,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| logger.error("db failed: couponOrder-" + couponOrderId + ", e:" + e.getMessage()); | logger.error("db failed: couponOrder-" + couponOrderId + ", e:" + e.getMessage()); | ||||
| throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); | throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); | ||||
| } | } | ||||
| // 库存回复+1 | |||||
| wxOrderService.stockBack(wxOrder); | |||||
| return new ResultData(wxCouponOrder); | return new ResultData(wxCouponOrder); | ||||
| } | } | ||||
| @@ -140,7 +140,8 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| } | } | ||||
| private void stockBack(WxOrder updateOrder) { | |||||
| @Override | |||||
| public void stockBack(WxOrder updateOrder) { | |||||
| // 已取消/已退款,库存加1 | // 已取消/已退款,库存加1 | ||||
| // 获取订单相关coupon | // 获取订单相关coupon | ||||
| Long couponId = updateOrder.getCouponId(); | Long couponId = updateOrder.getCouponId(); | ||||
| @@ -268,6 +268,8 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| wxRefundOrderP.setOut_refund_no(out_refund_id); | wxRefundOrderP.setOut_refund_no(out_refund_id); | ||||
| wxRefundOrderP.setTotal_fee(record.getTotalFee()); | wxRefundOrderP.setTotal_fee(record.getTotalFee()); | ||||
| wxRefundOrderP.setRefund_fee(record.getRefundFee()); | wxRefundOrderP.setRefund_fee(record.getRefundFee()); | ||||
| wxRefundOrderP.setRefund_desc("B端商户退款"); | |||||
| wxRefundOrderP.setNotify_url(payAccount.getNotifyUrl() + "/refund"); | |||||
| if (isReal) { | if (isReal) { | ||||
| Map signMap = new HashMap(); | Map signMap = new HashMap(); | ||||