lin 3 лет назад
Родитель
Сommit
8e5fc7e0c5
2 измененных файлов: 18 добавлений и 8 удалений
  1. +15
    -5
      mallinkBApi/src/main/java/com/iformall/controller/BaseController.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 15
- 5
mallinkBApi/src/main/java/com/iformall/controller/BaseController.java Просмотреть файл

@@ -138,12 +138,22 @@ public class BaseController {
throw new MallinkException(ErrorCode.USER_IS_EMPTY); throw new MallinkException(ErrorCode.USER_IS_EMPTY);
} }
TenantEntity tenantEntity = getTenantInfo(); TenantEntity tenantEntity = getTenantInfo();
if (user.getTenantId() == null) {
user.setTenantId(tenantEntity.getTenantId());
}
if (user.getParentTenantId() == null) {
user.setParentTenantId(tenantEntity.getParentTenantId());
if (tenantEntity.isChildMall()) {
if (user.getTenantId() == null) {
user.setTenantId(tenantEntity.getParentTenantId());
}
if (user.getParentTenantId() == null) {
user.setParentTenantId(null);
}
}else {
if (user.getTenantId() == null) {
user.setTenantId(tenantEntity.getTenantId());
}
if (user.getParentTenantId() == null) {
user.setParentTenantId(tenantEntity.getParentTenantId());
}
} }
return user; return user;
} }




+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -1266,7 +1266,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
if(EnumCouponType.COUPON_DISTRIBUTION.getCode().equals(wxCoupon.getType())){ if(EnumCouponType.COUPON_DISTRIBUTION.getCode().equals(wxCoupon.getType())){
//可配送商品 //可配送商品
WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); WxCouponMerchant wxCouponMerchant = new WxCouponMerchant();
wxCouponMerchant.updateTenantInfo(wxCoupon);
wxCouponMerchant.updateTenantInfo(bUser);
wxCouponMerchant.setProductId(wxCoupon.getId()); wxCouponMerchant.setProductId(wxCoupon.getId());
wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode());
WxCouponMerchant cm = null; WxCouponMerchant cm = null;
@@ -1295,7 +1295,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT); throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT);
} }
WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); WxCouponMerchant wxCouponMerchant = new WxCouponMerchant();
wxCouponMerchant.updateTenantInfo(wxCoupon);
wxCouponMerchant.updateTenantInfo(bUser);
wxCouponMerchant.setProductId(wxCoupon.getId()); wxCouponMerchant.setProductId(wxCoupon.getId());
wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode());
List<WxCouponMerchant> couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); List<WxCouponMerchant> couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant);
@@ -1315,7 +1315,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
if(wxPayOrder != null && EnumPayMchType.TOTAL.getCode().equals(wxPayOrder.getMchType()) if(wxPayOrder != null && EnumPayMchType.TOTAL.getCode().equals(wxPayOrder.getMchType())
&& EnumPayShare.YES.getCode().equals(wxPayOrder.getShare())){ && EnumPayShare.YES.getCode().equals(wxPayOrder.getShare())){
WxProfitSharingReceiver receiver = payServiceFactory.getPayShareAdapterService(wxPayOrder.getPayVendor(),couponOrder.getPayVersion()) WxProfitSharingReceiver receiver = payServiceFactory.getPayShareAdapterService(wxPayOrder.getPayVendor(),couponOrder.getPayVersion())
.getReceiver(couponOrder, merchantId, wxPayOrder.getTtPayWay(),wxPayOrder.getMchType());
.getReceiver(bUser, merchantId, wxPayOrder.getTtPayWay(),wxPayOrder.getMchType());
if (null == receiver) { if (null == receiver) {
throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL.getCode(),"当前商户没有配置收款账号。"); throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL.getCode(),"当前商户没有配置收款账号。");
} }


Загрузка…
Отмена
Сохранить