Просмотр исходного кода

//update

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
d3b6cdf7ff
2 измененных файлов: 5 добавлений и 1 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java Просмотреть файл

@@ -46,7 +46,7 @@ public class WxProfitSharingReceiver extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="分账金额(分)",name="sharingAmount") @io.swagger.annotations.ApiModelProperty(value="分账金额(分)",name="sharingAmount")
private Integer sharingAmount; private Integer sharingAmount;


@io.swagger.annotations.ApiModelProperty(value = "是否使用回执 0,不使用 1,使用", name = "isUse")
@io.swagger.annotations.ApiModelProperty(value = "0,不使用 1,使用", name = "isUse")
private Integer isUse; private Integer isUse;


@io.swagger.annotations.ApiModelProperty(value = "进件页面", name = "ttImportUrl") @io.swagger.annotations.ApiModelProperty(value = "进件页面", name = "ttImportUrl")


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

@@ -1283,6 +1283,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
psReceiverQ.setMerchantId(merchantId); psReceiverQ.setMerchantId(merchantId);
psReceiverQ.setSharingType(payServiceFactory.getPayShareAdapterService(couponOrder.getPayVendor()).getProfitSharingType()); psReceiverQ.setSharingType(payServiceFactory.getPayShareAdapterService(couponOrder.getPayVendor()).getProfitSharingType());
psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode());
psReceiverQ.setPlat(appInfo.getPlat());
if(EnumAppPlat.TOUTIAO.getCode().equals(psReceiverQ.getPlat())){
psReceiverQ.setIsUse(EnumProfitSharingUse.YES.getCode());
}
List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ);
if (null == payAccount.getShare()) { if (null == payAccount.getShare()) {
throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该租户payAccount未设置分账."); throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该租户payAccount未设置分账.");


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