Browse Source

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230701

release_toaliyun_real
xhxu 2 years ago
parent
commit
f4c341d22a
3 changed files with 18 additions and 0 deletions
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  2. +14
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java

+ 1
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java View File

@@ -381,6 +381,7 @@ public enum ErrorCode{
PROFIT_SHARING_QUERY_UNKNOWN_TYPE(12040, "分账查询类型不支持"), PROFIT_SHARING_QUERY_UNKNOWN_TYPE(12040, "分账查询类型不支持"),
PROFIT_SHARING_RECEIVER_UNKNOWN(12041, "收款方账户异常"), PROFIT_SHARING_RECEIVER_UNKNOWN(12041, "收款方账户异常"),
PROFIT_SHARING_TIME_EXPIRED(12042, "分账已过期"), PROFIT_SHARING_TIME_EXPIRED(12042, "分账已过期"),
PROFIT_SHARING_NO_SUB_LEDGER_AMOUNT(12043, "分账金额为0,请检查分账状态"),//特殊异常,不要使用


/** /**
* 核销 * 核销


+ 14
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java View File

@@ -246,6 +246,20 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
} }
} }


}catch (MallinkException e) {
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder();
updSharingOrder.updateTenantInfo(sharingOrder);
updSharingOrder.setId(sharingOrder.getId());
if(e.getErrorCode() == ErrorCode.PROFIT_SHARING_NO_SUB_LEDGER_AMOUNT.getCode()){
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getCode());
updSharingOrder.setErrorMsg(e.getMessage());
}else{
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode());
updSharingOrder.setErrorMsg(e.getMessage());
}
updSharingOrder.setUpdateTime(currentDate);
wxProfitSharingOrderMapper.updateById(updSharingOrder);
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),e.getMessage());
}catch(Exception e){ }catch(Exception e){
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder(); WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder();
updSharingOrder.updateTenantInfo(sharingOrder); updSharingOrder.updateTenantInfo(sharingOrder);


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java View File

@@ -124,6 +124,9 @@ public class TtServiceFeeService implements ServiceFeeAdapterService{
if(queryUnsettleAmount == null){ if(queryUnsettleAmount == null){
return false; return false;
} }
if(queryUnsettleAmount.getUnsettleAmount() <= 0){
throw new MallinkException(ErrorCode.PROFIT_SHARING_NO_SUB_LEDGER_AMOUNT);
}
wxComposeChildOrderShare.setRealRateAmount(queryUnsettleAmount.getPaymentRake()); wxComposeChildOrderShare.setRealRateAmount(queryUnsettleAmount.getPaymentRake());


wxComposeChildOrderShare.setCommissionAmount(queryUnsettleAmount.getLifeRake()); wxComposeChildOrderShare.setCommissionAmount(queryUnsettleAmount.getLifeRake());


Loading…
Cancel
Save