xhxu 3 лет назад
Родитель
Сommit
ef74f72e71
5 измененных файлов: 110 добавлений и 105 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java
  2. +5
    -0
      mallinkAdmin/src/main/resources/db/migration/V2022090500001__addkanjia.sql
  3. +101
    -101
      mallinkAdmin/src/main/resources/db/migration/V2022090500002__addsharingorder.sql
  4. +0
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java Просмотреть файл

@@ -92,7 +92,7 @@ public class WxLevelConfigController extends BaseController {
@SystemControllerLog(description = "会员等级权益-删除")
public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete");
if(wxLevelConfig.getId() != null){
if(wxLevelConfig.getId() == null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) {


+ 5
- 0
mallinkAdmin/src/main/resources/db/migration/V2022090500001__addkanjia.sql Просмотреть файл

@@ -7,3 +7,8 @@ UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6611, 60701, 60702]' WHERE `id` = 1035001036;


UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 7, 8, 9, 10, 50, 101, 102, 103, 104, 105, 106, 107, 201, 202, 203, 204, 205, 209, 211, 212, 221, 222, 251, 409, 410, 411, 416, 418, 420, 421, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 961, 6611, 60701, 60702]' WHERE `id` = 2;
UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6611, 60701, 60702]' WHERE `id` = 89;
UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 906, 907, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6611, 60701, 60702]' WHERE `id` = 1028;



+ 101
- 101
mallinkAdmin/src/main/resources/db/migration/V2022090500002__addsharingorder.sql Просмотреть файл

@@ -1,400 +1,400 @@
ALTER TABLE `mallink`.`wx_profit_sharing_order_0`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_1`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_2`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;p
ALTER TABLE `mallink`.`wx_profit_sharing_order_3`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_4`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_5`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_6`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_7`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_8`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_9`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_10`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_11`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_12`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_13`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_14`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_15`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_16`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_17`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_18`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_19`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_20`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_21`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_22`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_23`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_24`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_25`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_26`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_27`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_28`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_29`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_30`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_31`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_32`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_33`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_34`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_35`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_36`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_37`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_38`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_39`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_40`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_41`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_42`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_43`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_44`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_45`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_46`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_47`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_48`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_49`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_50`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_51`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_52`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_53`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_54`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_55`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_56`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_57`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_58`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_59`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_60`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_61`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_62`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_63`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_64`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_65`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_66`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_67`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_68`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_69`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_70`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_71`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_72`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_73`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_74`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_75`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_76`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_77`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_78`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_79`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_80`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_81`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_82`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_83`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_84`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_85`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_86`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_87`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_88`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_89`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_90`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_91`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_92`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_93`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_94`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_95`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_96`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_97`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_98`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_99`
ADD COLUMN `pay_version` smallint(3) AFTER `pay_vendor`,
ADD COLUMN `mchType` smallint(3) AFTER `pay_version`,
ADD COLUMN `mch_type` smallint(3) AFTER `pay_version`,
ADD COLUMN `point_deduction` json COMMENT '各种扣点费用' AFTER `type`;

+ 0
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -1718,11 +1718,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
Date time = DateUtils.stringToDate("2022-09-08 14:10:00", "yyyy-MM-dd HH:mm:ss");
if(EnumPayWay.PAY_WAY_WECHAT.getCode().equals(wxPayOrder.getPayVendor())
&& wxPayOrder.getCreateTime().before(time)){
logger.info("test");
return;
}
logger.info(wxPayOrder.getPayVendor().toString());
logger.info(wxPayOrder.getCreateTime().toString());
return;
} catch (Exception e) {
logger.error("核销记账失败"+e.getMessage(),e);


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java Просмотреть файл

@@ -225,6 +225,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
updSharingOrder.setUpdateTime(currentDate);

if(shareResult.isSuccess()){
updSharingOrder.setPayTimeEnd(currentDate);
updSharingOrder.setSharingOrderNo(shareResult.getShareOrderNo());
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode());
updSharingOrder.setErrorMsg("");
@@ -295,6 +296,8 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
final IdWorker idworker = IdWorker.get();
record.setId(idworker.nextId());
record.updateTenantInfo(payOrder);
record.setPayTimeStart(currentDate);
record.setPayTimeEnd(currentDate);
record.setTransactionId(payOrder.getTransactionId());
record.setOrderId(payOrder.getId());
record.setPayVendor(payOrder.getPayVendor());


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