From 44a4888357f9b793c0c78db710dd5a69ad330b72 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 29 Nov 2021 13:52:42 +0800 Subject: [PATCH] update refund --- .../market/WxCouponOrderController.java | 3 ++- .../controller/WxRefundOrderController.java | 24 ++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java index 43980a21c..dfc73276b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java @@ -104,7 +104,8 @@ public class WxCouponOrderController extends BaseController { WxAppinfo appinfoQ = new WxAppinfo(); appinfoQ.updateTenantInfo(getTenantInfo()); appinfoQ.setPlat(EnumPayWay.getEnum(wxCouponOrder.getPayVendor()).getPlat().getCode()); - appinfoQ.setType(EnumAppType.B.getCode()); +// appinfoQ.setType(EnumAppType.B.getCode()); + appinfoQ.setType(EnumAppType.C.getCode()); PageInfo appinfoPageInfo = wxAppinfoService.listAsPage(appinfoQ, 1, 1); if (appinfoPageInfo.getList().size() > 0) { WxAppinfo appinfo = appinfoPageInfo.getList().get(0); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java index 0eff6b589..a8e5dac8b 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java @@ -5,8 +5,12 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.enums.EnumAppType; import com.iformall.enums.EnumPayType; +import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; +import com.iformall.service.WxAppinfoService; +import com.iformall.service.WxCouponOrderService; import com.iformall.service.WxRefundOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -26,6 +30,12 @@ import java.util.Map; public class WxRefundOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private WxCouponOrderService wxCouponOrderService; + + @Autowired + private WxAppinfoService wxAppinfoService; + @Autowired private WxRefundOrderService wxRefundOrderService; @@ -47,9 +57,21 @@ public class WxRefundOrderController extends BaseController { logger.error("couponOrderId参数不正确: " + paramMap.toString()); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } + WxCouponOrder wxCouponOrder = wxCouponOrderService.getById(couponOrderId,getTenantInfo().getTenantId()); + if (wxCouponOrder == null) { + logger.error("券ID不存在:" + couponOrderId); + throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); + } WxMerchantBUser bUser = getLoginBUser(); - WxAppinfo appinfo = getAppInfo(bUser.getAppId()); + + WxAppinfo appinfo = new WxAppinfo(); + appinfo.updateTenantInfo(getTenantInfo()); + //appinfo.setType(EnumAppType.B.getCode()); + appinfo.setPlat(EnumPayWay.getEnum(wxCouponOrder.getPayVendor()).getPlat().getCode()); + appinfo.setType(EnumAppType.C.getCode()); + appinfo = wxAppinfoService.getList(appinfo).get(0); +// WxAppinfo appinfo = getAppInfo(bUser.getAppId()); try { ResultData rd = wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_B_REFUND, bUser.getId()); return rd;