Procházet zdrojové kódy

//coupon

release_toaliyun_real
xhxu před 3 roky
rodič
revize
c81097d0e0
2 změnil soubory, kde provedl 12 přidání a 5 odebrání
  1. +2
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxPayAccountController.java
  2. +10
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 2
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxPayAccountController.java Zobrazit soubor

@@ -40,12 +40,11 @@ public class WxPayAccountController extends BaseController {
public ResultData getPayAccount(@RequestBody Map<String, String> paramMap) {
logger.info("/api/payAccount/getPayAccount" + paramMap.toString());
String appId = paramMap.get("appId");
String tenantId = paramMap.get("tenantId");
if (StringUtils.isBlank(appId) || StringUtils.isBlank(tenantId)) {
if (StringUtils.isBlank(appId)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}

WxAppinfo wxAppinfo = getAppInfo(appId,tenantId);
WxAppinfo wxAppinfo = getAppInfo(appId,getTenantInfo().getTenantId());
if(wxAppinfo == null){
return new ResultData(ErrorCode.APP_ID_NOT_FOUND);
}


+ 10
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Zobrazit soubor

@@ -1338,12 +1338,20 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_PRE_VERIFY);
}

//核销tenant
TenantEntity mallTenantEntity = new TenantEntity();
if(bUser != null){
mallTenantEntity.updateTenantInfo(bUser);
}else{
mallTenantEntity.updateTenantInfo(wxCoupon);
}

// 2. 检查适用门店
Long merchantId = null;
if(EnumCouponType.COUPON_DISTRIBUTION.getCode().equals(wxCoupon.getType())){
//可配送商品
WxCouponMerchant wxCouponMerchant = new WxCouponMerchant();
wxCouponMerchant.updateTenantInfo(bUser);
wxCouponMerchant.updateTenantInfo(mallTenantEntity);
wxCouponMerchant.setProductId(wxCoupon.getId());
wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode());
WxCouponMerchant cm = null;
@@ -1392,7 +1400,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
if(wxPayOrder != null && EnumPayMchType.TOTAL.getCode().equals(wxPayOrder.getMchType())
&& EnumPayShare.YES.getCode().equals(wxPayOrder.getShare())){
WxProfitSharingReceiver receiver = payServiceFactory.getPayShareAdapterService(wxPayOrder.getPayVendor(),couponOrder.getPayVersion())
.getReceiver(bUser, merchantId, wxPayOrder.getTtPayWay(),wxPayOrder.getMchType());
.getReceiver(mallTenantEntity, merchantId, wxPayOrder.getTtPayWay(),wxPayOrder.getMchType());
if (null == receiver) {
throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL.getCode(),"当前商户没有配置收款账号。");
}


Načítá se…
Zrušit
Uložit