|
|
|
@@ -829,7 +829,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Long getCouponOneMerchantId(EnumPayWay payWay, Long couponChannelId, String tenantId) { |
|
|
|
public Long getCouponOneMerchantId(Long couponChannelId, String tenantId) { |
|
|
|
WxCouponChannel couponChannel = wxCouponChannelMapper.selectById(couponChannelId, tenantId); |
|
|
|
List<Long> merchantIds = wxCouponMerchantMapper.findMerchantIdListByProduct(couponChannel.getCouponId(), tenantId); |
|
|
|
Long merchantId = null; |
|
|
|
@@ -849,22 +849,22 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { |
|
|
|
return merchantId; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public String getCouponOneMerchantUid(EnumPayWay payWay,Long merchantId, String tenantId) { |
|
|
|
if(merchantId != null){ |
|
|
|
WxProfitSharingReceiver psReceiverQ = new WxProfitSharingReceiver(); |
|
|
|
psReceiverQ.setTenantId(tenantId); |
|
|
|
psReceiverQ.setMerchantId(merchantId); |
|
|
|
// psReceiverQ.setSharingType(payServiceFactory.getPayShareAdapterService(payWay.getCode()).getProfitSharingType()); |
|
|
|
psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); |
|
|
|
psReceiverQ.setPlat(payWay.getPlat().getCode()); |
|
|
|
List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); |
|
|
|
if(psReceiverList != null && psReceiverList.size() == 1){ |
|
|
|
return psReceiverList.get(0).getReceiverAccount(); |
|
|
|
} |
|
|
|
} |
|
|
|
return null; |
|
|
|
} |
|
|
|
// @Override |
|
|
|
// public String getCouponOneMerchantUid(EnumPayWay payWay,Long merchantId, String tenantId) { |
|
|
|
// if(merchantId != null){ |
|
|
|
// WxProfitSharingReceiver psReceiverQ = new WxProfitSharingReceiver(); |
|
|
|
// psReceiverQ.setTenantId(tenantId); |
|
|
|
// psReceiverQ.setMerchantId(merchantId); |
|
|
|
//// psReceiverQ.setSharingType(payServiceFactory.getPayShareAdapterService(payWay.getCode()).getProfitSharingType()); |
|
|
|
// psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); |
|
|
|
// psReceiverQ.setPlat(payWay.getPlat().getCode()); |
|
|
|
// List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); |
|
|
|
// if(psReceiverList != null && psReceiverList.size() == 1){ |
|
|
|
// return psReceiverList.get(0).getReceiverAccount(); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// return null; |
|
|
|
// } |
|
|
|
|
|
|
|
@Override |
|
|
|
public WxCouponChannel getPriceAndStock(TenantEntity tenantEntity, Long couponChannelId) { |
|
|
|
|