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

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

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
987130bfbe
2 измененных файлов: 30 добавлений и 39 удалений
  1. +0
    -39
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +30
    -0
      mallinkAdmin/src/main/resources/db/migration/V2023021300001__add_分账类型.sql

+ 0
- 39
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Просмотреть файл

@@ -454,43 +454,4 @@ public class WxMerchantController extends BaseController {
return wxProfitPaymentReceiverService.updateTtReceiverImportStatus(merchant); return wxProfitPaymentReceiverService.updateTtReceiverImportStatus(merchant);
} }


@ApiOperation("更新收款账户信息:必填项 id(商户ID) name(商户名称) accountId(账号ID) accountTypeValue(账号类型) accountName(账号名称)")
@PostMapping("/updateAccount")
public ResultData updateAccount(@RequestBody WxMerchant wxMerchant) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::updateAccount");

if (wxMerchant.getId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空");
}
WxMerchant merchant = wxMerchantService.selectById(wxMerchant.getId());
if (merchant == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "未找到门店");
}
wxMerchant.setName(merchant.getName());
if (wxMerchant.getAccountTypeValue() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "账号类型不能为空");
}
if (StringUtils.isEmpty(wxMerchant.getAccountId())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "账号ID不能为空");
}
if (StringUtils.isEmpty(wxMerchant.getAccountName())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "账号名称不能为空");
}
wxMerchant.updateTenantInfo(getTenantInfo());
return wxMerchantService.updateMerchantAccount(wxMerchant);
}

@ApiOperation("删除分账账户")
@GetMapping("/deleteByReceiverId")
@ApiImplicitParam(name = "id", value = "商户分账账户ID", dataType = "Long", paramType = "query", required = true)
public ResultData deleteByReceiverId(@ModelAttribute WxProfitSharingReceiver receiver) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::deleteByReceiverId");

if (receiver.getId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空");
}
receiver.updateTenantInfo(getTenantInfo());
return wxProfitSharingReceiverService.delReceiver(receiver, EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode());
}

} }

+ 30
- 0
mallinkAdmin/src/main/resources/db/migration/V2023021300001__add_分账类型.sql Просмотреть файл

@@ -1,6 +1,36 @@
--创建收款帐号表 --创建收款帐号表
DROP TABLE IF EXISTS `wx_profit_payment_receiver`;
CREATE TABLE `wx_profit_payment_receiver` (
`id` bigint(20) NOT NULL COMMENT '主键ID',
`tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '租户ID',
`parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID',
`merchant_id` bigint(20) NOT NULL COMMENT '商户ID',
`receiver_type` int(11) NOT NULL COMMENT '收款帐号类型',
`receiver_account` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '收款帐号',
`receiver_comments` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '说明',
`create_time` datetime(0) DEFAULT NULL,
`update_time` datetime(0) DEFAULT NULL,
`status` int(11) DEFAULT 0 COMMENT '状态: 0,正常 1,停用',
`plat` smallint(3) NOT NULL DEFAULT 1 COMMENT '平台 1:微信 2:阿里 3:头条',
`tt_import_status` json COMMENT '进件状态',
`tt_import_url` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '进件页面',
`tt_balance_url` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '余额页面',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `id_UNIQUE`(`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '分账接收方' ROW_FORMAT = Dynamic;


--备份分账帐号表 --备份分账帐号表
--将微信进件的数据转移到收款帐号表里--并将原数据删除 --将微信进件的数据转移到收款帐号表里--并将原数据删除
INSERT INTO `mallink`.`wx_profit_payment_receiver`(`id`, `tenant_id`, `parent_tenant_id`, `merchant_id`, `receiver_type`, `receiver_account`, `create_time`, `update_time`, `status`, `plat`, `tt_import_status`, `tt_import_url`, `tt_balance_url`)
(select `id`, `tenant_id`, `parent_tenant_id`, `merchant_id`, `receiver_type`, `receiver_account`, `create_time`, `update_time`, `status`, `plat`, `tt_import_status`, `tt_import_url`, `tt_balance_url` from wx_profit_sharing_receiver
where plat = 1 and sharing_type = 4);


delete from wx_profit_sharing_receiver where plat = 1 and sharing_type = 4;
--将抖音进件的数据转移到收款帐号表里--原数据修改ReceiverType =10 --将抖音进件的数据转移到收款帐号表里--原数据修改ReceiverType =10
INSERT INTO `mallink`.`wx_profit_payment_receiver`(`id`, `tenant_id`, `parent_tenant_id`, `merchant_id`, `receiver_type`, `receiver_account`, `create_time`, `update_time`, `status`, `plat`, `tt_import_status`, `tt_import_url`, `tt_balance_url`)
(select `id`, `tenant_id`, `parent_tenant_id`, `merchant_id`, `receiver_type`, `receiver_account`, `create_time`, `update_time`, `status`, `plat`, `tt_import_status`, `tt_import_url`, `tt_balance_url` from wx_profit_sharing_receiver
where plat = 3 and sharing_type = 3);

update wx_profit_sharing_receiver set receiver_type = 10 where plat = 3 and sharing_type = 3;

update wx_profit_sharing_receiver set sharing_type = 1 where sharing_type != 2;

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