From 9e5d8d12a6e671be89157fd887e0ed4a3adaf881 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jul 2023 14:48:20 +0800 Subject: [PATCH 1/2] //..sharing --- .../main/java/com/iformall/common/ErrorCode.java | 1 + .../impl/WxProfitSharingOrderServiceImpl.java | 14 ++++++++++++++ .../pay/service/fee/TtServiceFeeService.java | 3 +++ 3 files changed, 18 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index eb386d7a2..28f5998ef 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -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,请检查分账状态"),//特殊异常,不要使用 /** * 核销 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 74293f233..73db4ad19 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -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); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java index 90d181d89..5f3eaa21c 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/fee/TtServiceFeeService.java @@ -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()); From c0d123843634064dbcc24a2a0c51f527c9d197b0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jul 2023 15:26:31 +0800 Subject: [PATCH 2/2] //..sql --- .../db/migration/V2023071400001__merchant_poi_permission.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023071400001__merchant_poi_permission.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023071400001__merchant_poi_permission.sql b/mallinkAdmin/src/main/resources/db/migration/V2023071400001__merchant_poi_permission.sql new file mode 100644 index 000000000..efb4b9800 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023071400001__merchant_poi_permission.sql @@ -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;