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

//add sharing

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
11f363d868
2 измененных файлов: 24 добавлений и 3 удалений
  1. +22
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java

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

@@ -1684,7 +1684,28 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
} catch (Exception e) {
logger.error("核销记账失败"+e.getMessage(),e);
}
}
}else if(wxPayOrder != null){
WxProfitSharingReceiver psReceiverQ = new WxProfitSharingReceiver();
psReceiverQ.updateTenantInfo(wxPayOrder);
psReceiverQ.setMerchantId(merchantId);
psReceiverQ.setSharingType(payServiceFactory.getPayShareAdapterService(payWay).getProfitSharingType());
psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode());
psReceiverQ.setPlat(EnumPayWay.getEnum(payWay).getPlat().getCode());
if(EnumAppPlat.TOUTIAO.getCode().equals(psReceiverQ.getPlat())){
psReceiverQ.setIsUse(EnumProfitSharingUse.YES.getCode());
}
List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ);
if (psReceiverList == null || psReceiverList.size() == 0) {
try {
// 查询不到分账帐号,往账户里面记帐
if (couponOrder.getCouponPrice() > 0) {
recordAfterVerified(couponOrder, merchantId);
}
} catch (Exception e) {
logger.error("核销记账失败"+e.getMessage(),e);
}
}
}
if(wxPayOrder != null){
WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto();
wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId());


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

@@ -256,11 +256,11 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
psReceiverQ.setIsUse(EnumProfitSharingUse.YES.getCode());
}
List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ);
if (psReceiverList.size() < 0 || psReceiverList.size() > 50) {
if (psReceiverList != null || psReceiverList.size() > 50) {
return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID);
}

if (psReceiverList.size() == 0) { //没有分账账户,直接结束分账
if (psReceiverList == null || psReceiverList.size() == 0) { //没有分账账户,直接结束分账
if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()))
sharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode());
if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode()))


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