Ver a proveniência

update refund

release_toaliyun_real
xhxu há 4 anos
ascendente
cometimento
44a4888357
2 ficheiros alterados com 25 adições e 2 eliminações
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java
  2. +23
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java Ver ficheiro

@@ -104,7 +104,8 @@ public class WxCouponOrderController extends BaseController {
WxAppinfo appinfoQ = new WxAppinfo(); WxAppinfo appinfoQ = new WxAppinfo();
appinfoQ.updateTenantInfo(getTenantInfo()); appinfoQ.updateTenantInfo(getTenantInfo());
appinfoQ.setPlat(EnumPayWay.getEnum(wxCouponOrder.getPayVendor()).getPlat().getCode()); appinfoQ.setPlat(EnumPayWay.getEnum(wxCouponOrder.getPayVendor()).getPlat().getCode());
appinfoQ.setType(EnumAppType.B.getCode());
// appinfoQ.setType(EnumAppType.B.getCode());
appinfoQ.setType(EnumAppType.C.getCode());
PageInfo<WxAppinfo> appinfoPageInfo = wxAppinfoService.listAsPage(appinfoQ, 1, 1); PageInfo<WxAppinfo> appinfoPageInfo = wxAppinfoService.listAsPage(appinfoQ, 1, 1);
if (appinfoPageInfo.getList().size() > 0) { if (appinfoPageInfo.getList().size() > 0) {
WxAppinfo appinfo = appinfoPageInfo.getList().get(0); WxAppinfo appinfo = appinfoPageInfo.getList().get(0);


+ 23
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java Ver ficheiro

@@ -5,8 +5,12 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.enums.EnumAppType;
import com.iformall.enums.EnumPayType; import com.iformall.enums.EnumPayType;
import com.iformall.enums.EnumPayWay;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.WxAppinfoService;
import com.iformall.service.WxCouponOrderService;
import com.iformall.service.WxRefundOrderService; import com.iformall.service.WxRefundOrderService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
@@ -26,6 +30,12 @@ import java.util.Map;
public class WxRefundOrderController extends BaseController { public class WxRefundOrderController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired
private WxCouponOrderService wxCouponOrderService;

@Autowired
private WxAppinfoService wxAppinfoService;

@Autowired @Autowired
private WxRefundOrderService wxRefundOrderService; private WxRefundOrderService wxRefundOrderService;


@@ -47,9 +57,21 @@ public class WxRefundOrderController extends BaseController {
logger.error("couponOrderId参数不正确: " + paramMap.toString()); logger.error("couponOrderId参数不正确: " + paramMap.toString());
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); 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(); 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 { try {
ResultData rd = wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_B_REFUND, bUser.getId()); ResultData rd = wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_B_REFUND, bUser.getId());
return rd; return rd;


Carregando…
Cancelar
Guardar