Browse Source

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

release_toaliyun_real
lin 2 years ago
parent
commit
f506b0c67d
4 changed files with 21 additions and 0 deletions
  1. +3
    -0
      mallinkAdmin/src/main/resources/db/migration/V2023071400001__merchant_poi_permission.sql
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  3. +14
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java

+ 3
- 0
mallinkAdmin/src/main/resources/db/migration/V2023071400001__merchant_poi_permission.sql View File

@@ -0,0 +1,3 @@
INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (227, '抖音商户快捷入驻', 202, 'Y', NULL, 1, NULL, NULL, 'merchantInfoDetail', NULL, 0, 223);

UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 210, 211, 212, 221, 222, 223, 224, 226, 227, 251, 261, 409, 410, 411, 416, 424, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 612, 615, 622, 676, 680, 711, 716, 901, 902, 904, 907, 5502, 60201, 61202, 61501, 61502]' WHERE `id` = 13;

+ 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_RECEIVER_UNKNOWN(12041, "收款方账户异常"),
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){
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder();
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){
return false;
}
if(queryUnsettleAmount.getUnsettleAmount() <= 0){
throw new MallinkException(ErrorCode.PROFIT_SHARING_NO_SUB_LEDGER_AMOUNT);
}
wxComposeChildOrderShare.setRealRateAmount(queryUnsettleAmount.getPaymentRake());

wxComposeChildOrderShare.setCommissionAmount(queryUnsettleAmount.getLifeRake());


Loading…
Cancel
Save