| @@ -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; | |||||
| @@ -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,请检查分账状态"),//特殊异常,不要使用 | |||||
| /** | /** | ||||
| * 核销 | * 核销 | ||||
| @@ -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); | ||||
| @@ -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()); | ||||