From 4c6d26993aca2cb1f18afb278a8dbaa336d1563f Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 3 Mar 2023 15:14:38 +0800 Subject: [PATCH 1/6] //tenant msg --- .../impl/WxCUserBasicInfoServiceImpl.java | 18 ++++++++++++------ .../FmInsideCouponVerifyMsgServiceImpl.java | 5 +++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index a6b006058..829e15d70 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -746,12 +746,18 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc @Override public void updateTenantIdMsg(TenantEntity tenantInfo, TenantEntity mallTenant, Long userId) { - FmInsideBasicUserPushMsg basicUserPushMsg = new FmInsideBasicUserPushMsg(); - basicUserPushMsg.setMsgType(EnumMsgRecordType.MEMBER_UPDATE_TENANT.getCode()); - basicUserPushMsg.updateTenantInfo(tenantInfo); - basicUserPushMsg.setMallTenantEntity(mallTenant); - basicUserPushMsg.setBasicUserId(userId); - mqBaseProducer.sendMessage(basicUserPushMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + try{ + FmInsideBasicUserPushMsg basicUserPushMsg = new FmInsideBasicUserPushMsg(); + basicUserPushMsg.setMsgType(EnumMsgRecordType.MEMBER_UPDATE_TENANT.getCode()); + basicUserPushMsg.updateTenantInfo(tenantInfo); + basicUserPushMsg.setMallTenantEntity(mallTenant); + basicUserPushMsg.setBasicUserId(userId); + mqBaseProducer.sendMessage(basicUserPushMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + logger.info(">>>>>>>>>>>send updateTenantIdMsg :"+basicUserPushMsg); + }catch(Exception e){ + logger.info(">>>>>>>>>>>send updateTenantIdMsg : error"+e.getMessage()); + } + } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java index 69c1548d8..7ed33028c 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java @@ -32,6 +32,9 @@ public class FmInsideCouponVerifyMsgServiceImpl implements MsgSendService { @Autowired private WxMerchantBUserService merchantBUserService; + @Autowired + private WxCUserBasicInfoService wxCUserBasicInfoService; + @Autowired private WxMerchantService merchantService; @@ -58,6 +61,8 @@ public class FmInsideCouponVerifyMsgServiceImpl implements MsgSendService { orderService.sendInsideOrderPushDeliveryMsg(couponOrder,null,couponOrder.getId()); // orderService.sendInsideOrderPushMsg(couponOrder,couponOrder.getComposeOrderId()); + wxCUserBasicInfoService.updateTenantIdMsg(couponOrder,merchant,couponOrder.getCUserId()); + couponOrderService.actionAfterVerify(couponOrder, merchant); } } From 2354e2b791275ff0fc300ec46b99dcf5ced3adfe Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 3 Mar 2023 16:22:56 +0800 Subject: [PATCH 2/6] //qrcode --- .../V2023030300001__add_物料_permission.sql | 20 +++++++++++++++++++ .../douyin/miniapp/api/TtMaQrcode.java | 1 + 2 files changed, 21 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023030300001__add_物料_permission.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023030300001__add_物料_permission.sql b/mallinkAdmin/src/main/resources/db/migration/V2023030300001__add_物料_permission.sql new file mode 100644 index 000000000..8bca70e33 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023030300001__add_物料_permission.sql @@ -0,0 +1,20 @@ + +UPDATE `mallink`.`mall_permission` SET `resource_type` = 0, `url` = NULL WHERE `id` = 612; + +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (61201, '微信物料', 612, 'Y', NULL, 1, NULL, NULL, 'xiaochengxupath', 'icon-wuliaoguanli-', 0, 61201); +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (61202, '抖音物料', 612, 'Y', NULL, 1, NULL, NULL, 'ttpath', 'icon-wuliaoguanli-', 0, 61202); + + +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, 224, 225, 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, 431, 432, 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, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 715, 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, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1; +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, 224, 225, 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, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 961, 6611, 60701, 60702, 61201]' WHERE `id` = 2; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 224, 225, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 641, 642, 643, 644, 645, 646, 651, 652, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 60701, 60702, 61201]' WHERE `id` = 3; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 224, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 514, 521, 522, 523, 531, 532, 591, 601, 602, 604, 605, 606, 607, 608, 610, 611, 612, 613, 622, 623, 624, 625, 626, 641, 642, 643, 644, 661, 662, 663, 664, 671, 672, 674, 675, 681, 682, 684, 685, 691, 692, 693, 694, 695, 711, 901, 902, 904, 905, 906, 907, 908, 910, 931, 932, 60701, 60702, 61201]' WHERE `id` = 4; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 612, 615, 622, 647, 676, 680, 711, 901, 902, 904, 907, 61202, 61501, 61502]' WHERE `id` = 11; +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, 110, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 223, 224, 225, 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, 431, 432, 500, 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, 615, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 715, 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, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 12; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 109, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 511, 512, 522, 523, 509, 591, 595, 601, 605, 621, 622, 623, 624, 625, 626, 627, 671, 901, 902]' WHERE `id` = 100; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 615, 622, 648, 649, 676, 680, 711, 901, 902, 904, 907, 61501, 61502]' WHERE `id` = 101; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 612, 615, 622, 647, 650, 676, 680, 711, 901, 902, 904, 907, 41001, 61202, 61501, 61502, 71101]' WHERE `id` = 102; +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, 224, 225, 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, 431, 432, 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, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 715, 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, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1028; +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, 224, 225, 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, 431, 432, 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, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 715, 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, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1035001036; +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, 110, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 225, 223, 224, 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, 431, 432, 500, 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, 615, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 715, 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, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 103500103610; + diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java index 4bfced43c..46534e72a 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java @@ -21,6 +21,7 @@ public class TtMaQrcode extends AbstractWxMaQrcodeWrapper implements Serializabl private String appname; private String path; private int width = 430; + private boolean set_icon = true; public TtMaQrcode(String appname, String path, int width) { this.appname = appname; From 395f7abddc9041c549a5149d5cf1ed20b31b529f Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 3 Mar 2023 16:32:29 +0800 Subject: [PATCH 3/6] //qrcode --- .../main/java/com/iformall/controller/WxOrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 47ade0597..1c1c76c89 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -181,7 +181,7 @@ public class WxOrderController extends BaseController { // logger.info("支付2.0预下单回调---header{}"+header.toString()); String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); -// logger.info("支付2.0预下单回调---body{}"+body); + logger.info("支付2.0预下单回调---body{}"+body); try { JSONObject jsonObject = JSONObject.parseObject(body); String msg = jsonObject.getString("msg"); From 04347f0fcc5f16d8b43aa6066a5acb9840181a02 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 3 Mar 2023 19:08:28 +0800 Subject: [PATCH 4/6] //WXORDER --- .../V2023030300002__order_add_poiid.sql | 205 ++++++++++++++++++ .../java/com/iformall/domain/po/WxOrder.java | 3 + .../service/impl/WxOrderServiceImpl.java | 3 +- .../main/resources/mapper/WxOrderMapper.xml | 11 +- 4 files changed, 218 insertions(+), 4 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023030300002__order_add_poiid.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023030300002__order_add_poiid.sql b/mallinkAdmin/src/main/resources/db/migration/V2023030300002__order_add_poiid.sql new file mode 100644 index 000000000..107159af3 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023030300002__order_add_poiid.sql @@ -0,0 +1,205 @@ +ALTER TABLE `mallink`.`tt_merchant_poi` +MODIFY COLUMN `poi_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '抖音POIID' AFTER `extra`; + + + +ALTER TABLE `mallink`.`wx_order_0` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_1` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_2` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_3` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_4` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_5` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_6` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_7` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_8` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_9` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_10` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_11` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_12` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_13` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_14` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_15` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_16` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_17` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_18` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_19` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_20` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_21` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_22` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_23` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_24` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_25` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_26` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_27` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_28` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_29` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_30` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_31` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_32` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_33` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_34` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_35` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_36` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_37` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_38` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_39` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_40` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_41` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_42` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_43` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_44` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_45` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_46` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_47` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_48` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_49` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_50` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_51` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_52` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_53` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_54` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_55` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_56` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_57` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_58` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_59` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_60` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_61` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_62` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_63` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_64` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_65` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_66` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_67` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_68` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_69` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_70` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_71` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_72` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_73` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_74` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_75` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_76` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_77` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_78` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_79` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_80` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_81` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_82` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_83` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_84` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_85` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_86` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_87` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_88` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_89` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_90` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_91` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_92` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_93` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_94` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_95` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_96` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_97` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_98` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; +ALTER TABLE `mallink`.`wx_order_99` +ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 3eb694c87..72681c615 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -133,6 +133,9 @@ public class WxOrder extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="额外参数,用于第三方平台",name="extParam") private String extParam; + + @io.swagger.annotations.ApiModelProperty(value = "来自(抖音来自poiId)", name = "fromId") + private String fromId; public Object getExpParamValue(String key) { if (StringUtils.isBlank(extParam)) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 58433cc07..4498b5fc1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -3045,7 +3045,7 @@ public class WxOrderServiceImpl implements WxOrderService { record.setPayment(0); record.setFormId(formId); record.setOrderGroupId(0L); - record.setExtParam(extParam);; + record.setExtParam(extParam); record.setShippingType(shippingType); if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(shippingType)){ @@ -3663,6 +3663,7 @@ public class WxOrderServiceImpl implements WxOrderService { WxOrder updOrder = new WxOrder(); updOrder.updateTenantInfo(tenantEntity); updOrder.setId(singleOrder.getId()); + updOrder.setFromId(good.getPoiId()); if (good.getItemOrderInfoList().size() == 1) { updOrder.setExtParam(JSON.toJSONString(good.getItemOrderInfoList().get(0))); } else { diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index e1e953e4f..94aa776d9 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -37,11 +37,12 @@ + `id`,`order_number`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`coupon_channel_id`,`product_id`,`product_name`,`type`,`pay_vendor`,`pay_version`,`make_merchant_id`,`payment_type`,`payment`,`payment_time`,`freight_price`,`order_status`,`cps_status`,`create_date`,`update_date`,`detail`,`ref_detail`, - `press_end_date`,`press_current_num`,`press_current_value`,`order_group_id`,`form_id`,`total_payment`,`compose_order_id`,`coupon_number`,`compose_order_type`,`shipping_type`,`shipping_address`,`parent_order_id`,`ext_param` + `press_end_date`,`press_current_num`,`press_current_value`,`order_group_id`,`form_id`,`total_payment`,`compose_order_id`,`coupon_number`,`compose_order_type`,`shipping_type`,`shipping_address`,`parent_order_id`,`ext_param`,`from_id` @@ -152,6 +153,10 @@ and `parent_order_id` = #{parentOrderId} + + + and `from_id` = #{fromId} + and `order_status` in @@ -336,7 +341,7 @@ select o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.product_name,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, - o.compose_order_type,o.compose_order_id,o.parent_order_id,o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.ext_param + o.compose_order_type,o.compose_order_id,o.parent_order_id,o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.ext_param,o.from_id FROM wx_order o where o.`tenant_id` = #{tenantId} and o.c_user_id = #{cUserId} From dc6be9bdf24eceffed7f57c343f357c690a644a0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 3 Mar 2023 20:17:47 +0800 Subject: [PATCH 5/6] //sql --- .../V2023030300001__add_物料_permission.sql | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023030300001__add_物料_permission.sql b/mallinkAdmin/src/main/resources/db/migration/V2023030300001__add_物料_permission.sql index 8bca70e33..9a0ff387d 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023030300001__add_物料_permission.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023030300001__add_物料_permission.sql @@ -5,16 +5,23 @@ INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (61202, '抖音物料', 612, 'Y', NULL, 1, NULL, NULL, 'ttpath', 'icon-wuliaoguanli-', 0, 61202); -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, 224, 225, 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, 431, 432, 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, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 715, 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, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1; -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, 224, 225, 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, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 961, 6611, 60701, 60702, 61201]' WHERE `id` = 2; -UPDATE `mallink`.`mall_sale_type` SET `menus` = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 224, 225, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 641, 642, 643, 644, 645, 646, 651, 652, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 60701, 60702, 61201]' WHERE `id` = 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 (616, '批次活动', 6, 'Y', NULL, 0, NULL, NULL, NULL, 'icon-kehu', 0, 603); +UPDATE `mallink`.`mall_permission` SET `parent_id` = 616, `sort` = 6611 WHERE `id` = 6611; +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (6610, '券批次管理', 616, 'Y', NULL, 1, NULL, NULL, 'couponbatch', NULL, 0, 6610); + + + + +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, 224, 225, 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, 431, 432, 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, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 713, 714, 715, 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, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1; +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, 224, 225, 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, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 961, 6610, 6611, 60701, 60702, 61201]' WHERE `id` = 2; +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 224, 225, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 641, 642, 643, 644, 645, 646, 651, 652, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 60701, 60702, 61201]' WHERE `id` = 3; UPDATE `mallink`.`mall_sale_type` SET `menus` = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 224, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 514, 521, 522, 523, 531, 532, 591, 601, 602, 604, 605, 606, 607, 608, 610, 611, 612, 613, 622, 623, 624, 625, 626, 641, 642, 643, 644, 661, 662, 663, 664, 671, 672, 674, 675, 681, 682, 684, 685, 691, 692, 693, 694, 695, 711, 901, 902, 904, 905, 906, 907, 908, 910, 931, 932, 60701, 60702, 61201]' WHERE `id` = 4; UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 612, 615, 622, 647, 676, 680, 711, 901, 902, 904, 907, 61202, 61501, 61502]' WHERE `id` = 11; -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, 110, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 223, 224, 225, 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, 431, 432, 500, 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, 615, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 715, 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, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 12; +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, 110, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 223, 224, 225, 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, 431, 432, 500, 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, 615, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 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, 6610, 6611, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 12; UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 109, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 511, 512, 522, 523, 509, 591, 595, 601, 605, 621, 622, 623, 624, 625, 626, 627, 671, 901, 902]' WHERE `id` = 100; UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 615, 622, 648, 649, 676, 680, 711, 901, 902, 904, 907, 61501, 61502]' WHERE `id` = 101; UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 612, 615, 622, 647, 650, 676, 680, 711, 901, 902, 904, 907, 41001, 61202, 61501, 61502, 71101]' WHERE `id` = 102; -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, 224, 225, 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, 431, 432, 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, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 715, 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, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1028; -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, 224, 225, 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, 431, 432, 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, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 715, 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, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1035001036; -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, 110, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 225, 223, 224, 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, 431, 432, 500, 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, 615, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 715, 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, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 103500103610; +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, 224, 225, 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, 431, 432, 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, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 713, 714, 715, 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, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1028; +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, 224, 225, 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, 431, 432, 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, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 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, 713, 714, 715, 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, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1035001036; +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, 110, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 225, 223, 224, 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, 431, 432, 500, 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, 615, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 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, 6610, 6611, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 103500103610; From 1ac63ad6674a2812c009bd5f53ddf798ae1d15de Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 4 Mar 2023 10:58:15 +0800 Subject: [PATCH 6/6] fix coupon batch --- .../db/migration/V2023030300001__card.sql | 6 +- .../V2023030800001__coupon_press.sql | 24 +++ .../controller/WxCardPayController.java | 96 ++++----- .../com/iformall/domain/po/WxCouponBatch.java | 41 ++++ .../iformall/domain/po/WxCouponBatchItem.java | 34 +++ .../com/iformall/domain/vo/CouponBatchVo.java | 20 ++ .../mapper/WxCouponBatchItemMapper.java | 23 ++ .../iformall/mapper/WxCouponBatchMapper.java | 19 ++ .../service/WxCouponBatchService.java | 60 ++++++ .../impl/WxCouponBatchServiceImpl.java | 197 ++++++++++++++++++ .../service/impl/WxOrderServiceImpl.java | 137 ++++++++---- .../mapper/WxCouponBatchItemMapper.xml | 103 +++++++++ .../resources/mapper/WxCouponBatchMapper.xml | 67 ++++++ 13 files changed, 730 insertions(+), 97 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023030800001__coupon_press.sql create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatch.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatchItem.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/CouponBatchVo.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchItemMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/service/WxCouponBatchService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/impl/WxCouponBatchServiceImpl.java create mode 100644 mallinkService/src/main/resources/mapper/WxCouponBatchItemMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/WxCouponBatchMapper.xml diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023030300001__card.sql b/mallinkAdmin/src/main/resources/db/migration/V2023030300001__card.sql index 81642c761..3e09c4b8c 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023030300001__card.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023030300001__card.sql @@ -1,6 +1,6 @@ -alter table wx_coupon_password add column price int(11) not null default 0 comment '面额'; - -update wx_coupon_password cp inner join wx_coupon_89 c on cp.coupon_id = c.id set cp.price = c.price where cp.price = 0 and c.price > 0 ; +###已上线已执行### +#alter table wx_coupon_password add column price int(11) not null default 0 comment '面额'; +#update wx_coupon_password cp inner join wx_coupon_89 c on cp.coupon_id = c.id set cp.price = c.price where cp.price = 0 and c.price > 0 ; diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023030800001__coupon_press.sql b/mallinkAdmin/src/main/resources/db/migration/V2023030800001__coupon_press.sql new file mode 100644 index 000000000..7444ea748 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023030800001__coupon_press.sql @@ -0,0 +1,24 @@ +CREATE TABLE `wx_coupon_batch` ( + `id` bigint(20) unsigned NOT NULL, + `tenant_id` varchar(5) NOT NULL, + `parent_tenant_id` varchar(5) DEFAULT NULL, + `name` varchar(100) DEFAULT NULL COMMENT '批次名称', + `status` int(1) NOT NULL DEFAULT '0' COMMENT '状态0-草稿 1-进行中 2-已停止', + `create_date` datetime DEFAULT NULL, + `update_date` datetime DEFAULT NULL, + `allow_count` int(3) NOT NULL DEFAULT '0' COMMENT '限购次数', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + +CREATE TABLE `wx_coupon_batch_item` ( + `id` bigint(20) unsigned NOT NULL, + `coupon_batch_id` bigint(20) NOT NULL COMMENT '批次id', + `coupon_id` bigint(20) NOT NULL COMMENT '砍价券id', + `coupon_batch_status` int(1) NOT NULL COMMENT '批次状态', + `create_date` datetime DEFAULT NULL, + `update_date` datetime DEFAULT NULL, + `tenant_id` varchar(5) NOT NULL, + `parent_tenant_id` varchar(5) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 16fbfd66e..9845c966d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -199,54 +199,50 @@ public class WxCardPayController extends BaseController { } -// @ApiOperation("C端扫B端储值卡交易流水列表接口") -// @GetMapping("list") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), -// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) -// public ResultData cardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend, Integer pageNum, Integer pageSize) { -// String ipStr = getIpAddr(); -// logger.info("list: " + ipStr + " :" + wxCardSpend.toString()); -// Long memberId; -// try { -// memberId = getMemberId(); -// } catch (Exception e) { -// return new ResultData(Result.ERROR,e.getMessage()); -// } -// return cardSpendList(wxCardSpend,memberId, pageNum, pageSize); -// } -// -// private ResultData cardSpendList(WxCardSpendVo wxCardSpend,Long cUserId,Integer pageNum, Integer pageSize) { -// if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); -// wxCardSpend.updateTenantInfo(getTenantInfo()); -// wxCardSpend.setOwnerId(cUserId); -// List sources = new ArrayList(); -// sources.add(EnumMerchantSubsidySource.CARD.getCode()); -// wxCardSpend.setSources(sources); -// wxCardSpend.setCardSpendListShow(1); -// final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); -// return new ResultData(page); -// } -// -// @ApiOperation("C端扫B端储值卡交易流水SUM接口") -// @GetMapping("sum") -// public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { -// String ipStr = getIpAddr(); -// logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); -// Long memberId; -// try { -// memberId = getMemberId(); -// } catch (Exception e) { -// return new ResultData(Result.ERROR,e.getMessage()); -// } -// return sumCardSpendList(wxCardSpend,memberId); -// } -// -// private ResultData sumCardSpendList(WxCardSpendVo wxCardSpend,Long cUserId) { -// if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); -// wxCardSpend.updateTenantInfo(getTenantInfo()); -// wxCardSpend.setOwnerId(cUserId); -// final List> mapList = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); -// return new ResultData(mapList); -// } + @ApiOperation("C端扫B端储值卡交易流水列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData cardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend, Integer pageNum, Integer pageSize) { + String ipStr = getIpAddr(); + logger.info("list: " + ipStr + " :" + wxCardSpend.toString()); + Long memberId; + try { + memberId = getMemberId(); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } + return cardSpendList(wxCardSpend,memberId, pageNum, pageSize); + } + + private ResultData cardSpendList(WxCardSpendVo wxCardSpend,Long cUserId,Integer pageNum, Integer pageSize) { + if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); + wxCardSpend.updateTenantInfo(getTenantInfo()); + wxCardSpend.setOwnerId(cUserId); + final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("C端扫B端储值卡交易流水SUM接口") + @GetMapping("sum") + public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { + String ipStr = getIpAddr(); + logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); + Long memberId; + try { + memberId = getMemberId(); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } + return sumCardSpendList(wxCardSpend,memberId); + } + + private ResultData sumCardSpendList(WxCardSpendVo wxCardSpend,Long cUserId) { + if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); + wxCardSpend.updateTenantInfo(getTenantInfo()); + wxCardSpend.setOwnerId(cUserId); + final Map mapList = wxCardSpendService.sumCardSpend(wxCardSpend); + return new ResultData(mapList); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatch.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatch.java new file mode 100644 index 000000000..6e2785fe8 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatch.java @@ -0,0 +1,41 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.Date; +import java.util.List; + +@TableName(value = "wx_coupon_batch") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxCouponBatch extends TenantEntity { + + private static final long serialVersionUID = 6722507735075416305L; + + protected Long id; + @TableField(exist = false) + private List ids; + @io.swagger.annotations.ApiModelProperty(value="批次名称",name="name") + private String name; + @io.swagger.annotations.ApiModelProperty(value="EnumPressBatchStatus",name="status") + private Integer status; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + @io.swagger.annotations.ApiModelProperty(value="限购次数",name="allowCount") + private Integer allowCount; + + @TableField(exist = false) + private String couponIds; + @TableField(exist = false) + private String couponName; + + + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatchItem.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatchItem.java new file mode 100644 index 000000000..ab1f3d87f --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponBatchItem.java @@ -0,0 +1,34 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.Date; + +@TableName(value = "wx_coupon_batch_item") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxCouponBatchItem extends TenantEntity { + + private static final long serialVersionUID = 6722507735075416305L; + + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="批次id",name="couponBatchId") + private Long couponBatchId; + @io.swagger.annotations.ApiModelProperty(value="砍价券id",name="couponId") + private Long couponId; + @io.swagger.annotations.ApiModelProperty(value="EnumPressBatchStatus",name="pressBatchStatus") + private Integer couponBatchStatus; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + + @TableField(exist = false) + private WxCoupon coupon; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CouponBatchVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/CouponBatchVo.java new file mode 100644 index 000000000..470ae842c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CouponBatchVo.java @@ -0,0 +1,20 @@ +package com.iformall.domain.vo; + +import java.io.Serializable; +import java.text.DecimalFormat; +import java.util.List; + +import com.iformall.domain.po.WxCouponBatch; +import com.iformall.domain.po.WxDateAmountRecord; +import com.iformall.domain.po.WxPressBatch; + +import lombok.Data; + +@Data +public class CouponBatchVo implements Serializable{ + + private static final long serialVersionUID = 4494858079134918638L; + //核销金额记录 + private WxCouponBatch couponBatch; + private List couponIdList; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchItemMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchItemMapper.java new file mode 100644 index 000000000..eb71c2e7f --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchItemMapper.java @@ -0,0 +1,23 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxCouponBatchItem; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface WxCouponBatchItemMapper extends CommonMapper { + + List findList(WxCouponBatchItem record); + + List getBatchIdList(@Param("couponIds")List couponIds,@Param("tenantId")String tenantId,@Param("pressBatchStatus")Integer pressBatchStatus); + + WxCouponBatchItem getById(@Param("id")Long id,@Param("tenantId")String tenantId); + + void updateWxPressBatchStatus(WxCouponBatchItem record); + + void deleteItem(WxCouponBatchItem record); + + void deleteAllItem(WxCouponBatchItem record); + + List getCouponIds(@Param("pressBatchId")Long pressBatchId,@Param("tenantId")String tenantId,@Param("pressBatchStatus")Integer pressBatchStatus); +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchMapper.java new file mode 100644 index 000000000..f376a8a66 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponBatchMapper.java @@ -0,0 +1,19 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxCouponBatch; +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +public interface WxCouponBatchMapper extends CommonMapper { + + List findList(WxCouponBatch record); + + WxCouponBatch getById(@Param("id")Long id,@Param("tenantId")String tenantId); + + void updateWxPressBatchStatus(WxCouponBatch record); + + void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponBatchService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponBatchService.java new file mode 100644 index 000000000..bf6b2a051 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponBatchService.java @@ -0,0 +1,60 @@ +package com.iformall.service; + +import java.util.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.TtCouponChannelPoi; +import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponBatch; +import com.iformall.domain.po.WxCouponBatchItem; +import com.iformall.domain.po.WxOrder; +import com.iformall.domain.po.WxPressBatch; +import com.iformall.domain.po.WxPressBatchItem; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.CouponBatchVo; +import com.iformall.domain.vo.CouponPressBatchVo; +import com.iformall.domain.vo.TtCouponVo; +import com.iformall.domain.vo.WxCouponCVo; +import com.iformall.domain.vo.WxCouponStatisVo; +import com.iformall.domain.vo.WxMerchantVo; + +public interface WxCouponBatchService { + + + /** + * 根据实体查询分页列表 + * + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo listAsPage(WxCouponBatch record, Integer pageIndex, Integer pageSize); + + List list(WxCouponBatch wxCoupon); + + void saveOrUpdate(WxCouponBatch wxCoupon); + + WxCouponBatch getById(Long id,String tenantId); + + PageInfo getItemPage(Long batchId,String tenantId, Integer pageIndex, Integer pageSize); + List getItemList(Long batchId,String tenantId); + List getItemCouponIdList(Long batchId,String tenantId); + List getCouponIds(String tenantId); + + void saveItems(WxCouponBatch pressBatch,List couponIds); + + void deleteBatch(Long id,String tenantId); + void deleteItemById(Long itemId,String tenantId); + void deleteItemByBatchId(Long batchId,String tenantId); + + void updateStatus(WxCouponBatch pressBatch); + + CouponBatchVo getCouponPressBatch(WxCoupon coupon, Long cUserId); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponBatchServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponBatchServiceImpl.java new file mode 100644 index 000000000..0de24417d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponBatchServiceImpl.java @@ -0,0 +1,197 @@ +package com.iformall.service.impl; + +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.CouponBatchVo; +import com.iformall.domain.vo.CouponPressBatchVo; +import com.iformall.enums.EnumOrderStatus; +import com.iformall.enums.EnumOrderType; +import com.iformall.enums.EnumPressBatchStatus; +import com.iformall.enums.EnumYesOrNo; +import com.iformall.exception.MallinkException; +import com.iformall.mapper.*; +import com.iformall.service.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +@Service +public class WxCouponBatchServiceImpl implements WxCouponBatchService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxCouponBatchMapper wxCouponBatchMapper; + @Autowired + WxCouponBatchItemMapper wxCouponBatchItemMapper; + @Autowired + WxCouponOrderMapper wxCouponOrderMapper; + @Autowired + WxCouponMapper wxCouponMapper; + + + @Override + public List list(WxCouponBatch record){ + return wxCouponBatchMapper.findList(record); + } + + @Override + public PageInfo listAsPage(WxCouponBatch record, Integer pageIndex, Integer pageSize) { + if (!StringUtils.isBlank(record.getCouponName())) { + WxCoupon cq = new WxCoupon(); + cq.updateTenantInfo(record); + cq.setTitle(StringUtils.trimToNull(record.getCouponName())); + List cids = wxCouponMapper.findIdList(cq); + if (null == cids || cids.size() <= 0 ) { + record.setId(0L); + }else { + List ids = wxCouponBatchItemMapper.getBatchIdList(cids, record.getTenantId(), record.getStatus()); + if (null == ids || ids.size() <= 0) { + record.setId(0L); + }else { + record.setIds(ids); + } + } + } + + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponBatchMapper.findList(record)); + } + + @Override + public void saveOrUpdate(WxCouponBatch record) { + if (null == record.getId()) { + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + record.setCreateDate(new Date()); + record.setUpdateDate(new Date()); + wxCouponBatchMapper.insert(record); + }else { + record.setUpdateDate(new Date()); + wxCouponBatchMapper.updateById(record); + } + } + + @Override + public WxCouponBatch getById(Long id,String tenantId) { + return wxCouponBatchMapper.getById(id, tenantId); + } + + @Override + public PageInfo getItemPage(Long batchId,String tenantId, Integer pageIndex, Integer pageSize) { + WxCouponBatchItem iteq = new WxCouponBatchItem(); + iteq.setTenantId(tenantId); + iteq.setCouponBatchId(batchId); + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponBatchItemMapper.findList(iteq)); + } + + @Override + public List getItemList(Long batchId, String tenantId) { + WxCouponBatchItem iteq = new WxCouponBatchItem(); + iteq.setTenantId(tenantId); + iteq.setCouponBatchId(batchId); + return wxCouponBatchItemMapper.findList(iteq); + } + + @Override + public List getItemCouponIdList(Long batchId, String tenantId) { + WxCouponBatchItem iteq = new WxCouponBatchItem(); + iteq.setTenantId(tenantId); + iteq.setCouponBatchId(batchId); + return wxCouponBatchItemMapper.getCouponIds(batchId, tenantId, null); + } + + @Override + public List getCouponIds(String tenantId) { + WxCouponBatchItem iteq = new WxCouponBatchItem(); + iteq.setTenantId(tenantId); + return wxCouponBatchItemMapper.getCouponIds(null, tenantId, null); + } + + @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public void saveItems(WxCouponBatch pressBatch, List couponIds) { + for (Long cid : couponIds) { + WxCouponBatchItem iteq = new WxCouponBatchItem(); + iteq.updateTenantInfo(pressBatch); + iteq.setCouponBatchId(pressBatch.getId()); + iteq.setCouponId(cid); + iteq.setCouponBatchStatus(pressBatch.getStatus()); + iteq.setCreateDate(new Date()); + iteq.setUpdateDate(new Date()); + wxCouponBatchItemMapper.insert(iteq); + } + } + + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + @Override + public void deleteBatch(Long id, String tenantId) { + wxCouponBatchMapper.deleteById(id, tenantId); + deleteItemByBatchId(id, tenantId); + } + + @Override + public void deleteItemById(Long itemId, String tenantId) { + WxCouponBatchItem iteq = new WxCouponBatchItem(); + iteq.setTenantId(tenantId); + iteq.setId(itemId); + wxCouponBatchItemMapper.deleteItem(iteq); + } + + @Override + public void deleteItemByBatchId(Long batchId, String tenantId) { + WxCouponBatchItem iteq = new WxCouponBatchItem(); + iteq.setTenantId(tenantId); + iteq.setCouponBatchId(batchId); + wxCouponBatchItemMapper.deleteAllItem(iteq); + } + + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + @Override + public void updateStatus(WxCouponBatch pressBatch) { + wxCouponBatchMapper.updateWxPressBatchStatus(pressBatch); + WxCouponBatchItem item = new WxCouponBatchItem(); + item.updateTenantInfo(pressBatch); + item.setCouponBatchId(pressBatch.getId()); + item.setCouponBatchStatus(pressBatch.getStatus()); + wxCouponBatchItemMapper.updateWxPressBatchStatus(item); + } + + @Override + public CouponBatchVo getCouponPressBatch(WxCoupon coupon, Long cUserId) { + WxCouponBatchItem query = new WxCouponBatchItem(); + query.updateTenantInfo(coupon); + query.setCouponId(coupon.getId()); + query.setCouponBatchStatus(EnumPressBatchStatus.RUNNING.getCode()); + List batchList = wxCouponBatchItemMapper.findList(query); + //一个砍价商品只能存在一个有效的批次 + if (null != batchList && batchList.size() > 0 ) { + if (batchList.size() > 1) { + throw new MallinkException(Result.ERROR,"该券["+coupon.getTitle()+"]存在多个有效批次活动,请联系管理员重新设置."); + }else { + WxCouponBatchItem batchItem = batchList.get(0); + WxCouponBatch pressBatch = wxCouponBatchMapper.getById(batchItem.getCouponBatchId(), batchItem.getTenantId()); + //查询该批次下所有的砍价商品, + List batchCouponIds = wxCouponBatchItemMapper.getCouponIds(batchItem.getCouponBatchId(), batchItem.getTenantId(), EnumPressBatchStatus.RUNNING.getCode()); + if (null == batchCouponIds || batchCouponIds.size() <= 0 ) { + throw new MallinkException(Result.ERROR,"未查询到砍价["+coupon.getTitle()+"]有效批次活动记录,"); + } + CouponBatchVo vo = new CouponBatchVo(); + vo.setCouponBatch(pressBatch); + vo.setCouponIdList(batchCouponIds); + return vo; + } + } + return null; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 4498b5fc1..f089be994 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -237,6 +237,11 @@ public class WxOrderServiceImpl implements WxOrderService { @Autowired WxPressBatchService wxPressBatchService; + @Lazy + @Autowired + WxCouponBatchService wxCouponBatchService; + + @Override public PageInfo listAsPage(WxOrder record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); @@ -775,51 +780,13 @@ public class WxOrderServiceImpl implements WxOrderService { // } //如果是砍价,则需要判断批次规则 if (isPressOrder) { - CouponPressBatchVo checkPressResult = wxPressBatchService.getCouponPressBatch(counpon, user.getId()); - if (null != checkPressResult) { - WxPressBatch pressBatch = checkPressResult.getPressBatch(); - List cids = checkPressResult.getCouponIdList(); - if (null != cids && cids.size() > 0 ) { - couponOrderQ.setCouponIds(cids); - //判断这些券发起中+已完成的 - WxOrder orderq = new WxOrder(); - orderq.updateTenantInfo(counpon); - orderq.setCouponIds(cids); - orderq.setCUserId(user.getId()); - //if (pressBatch.getPromoterLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { - List statusS = new ArrayList(); - statusS.add(EnumOrderStatus.ORDER_STATUS_PRESSING.getCode()); - statusS.add(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode()); - statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); - statusS.add(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); - statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); - statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode()); - statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode()); - orderq.setStatusS(statusS); - //} - int _count = wxOrderMapper.countCouponConditionType1(orderq); - if (_count >= pressBatch.getPromoterAllowCount()) { - throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"当前用户发起砍价次数已超限.["+pressBatch.getName()+"]"); - } - - if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { - couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); - } - couponOrderQ.setCouponId(counpon.getId()); - }else { - throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"砍价批次["+pressBatch.getName()+"]未设置券."); - } - }else { - if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { - couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); - } - couponOrderQ.setCouponId(counpon.getId()); - } + checkPressBatchRule(counpon, couponOrderQ, user); }else { - if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { - couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); - } - couponOrderQ.setCouponId(counpon.getId()); + checkCouponBatchRule(counpon, couponOrderQ, user); +// if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { +// couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); +// } +// couponOrderQ.setCouponId(counpon.getId()); } return wxCouponOrderMapper.findProductCount(couponOrderQ)+couponNumber; } catch(MallinkException e1) { @@ -830,6 +797,88 @@ public class WxOrderServiceImpl implements WxOrderService { } } + + private void checkPressBatchRule(WxCoupon counpon,WxCouponOrder couponOrderQ,WxCUserBasicInfo user) { + CouponPressBatchVo checkPressResult = wxPressBatchService.getCouponPressBatch(counpon, user.getId()); + if (null != checkPressResult) { + WxPressBatch pressBatch = checkPressResult.getPressBatch(); + List cids = checkPressResult.getCouponIdList(); + if (null != cids && cids.size() > 0 ) { + couponOrderQ.setCouponIds(cids); + //判断这些券发起中+已完成的 + WxOrder orderq = new WxOrder(); + orderq.updateTenantInfo(counpon); + orderq.setCouponIds(cids); + orderq.setCUserId(user.getId()); + //if (pressBatch.getPromoterLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { + List statusS = new ArrayList(); + statusS.add(EnumOrderStatus.ORDER_STATUS_PRESSING.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode()); + orderq.setStatusS(statusS); + //} + int _count = wxOrderMapper.countCouponConditionType1(orderq); + if (_count >= pressBatch.getPromoterAllowCount()) { + throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"当前用户发起砍价次数已批次超限.["+pressBatch.getName()+"]"); + } + + if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { + couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); + } + couponOrderQ.setCouponId(counpon.getId()); + }else { + throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"砍价批次["+pressBatch.getName()+"]未设置券."); + } + }else { + if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { + couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); + } + couponOrderQ.setCouponId(counpon.getId()); + } + } + + private void checkCouponBatchRule(WxCoupon counpon,WxCouponOrder couponOrderQ,WxCUserBasicInfo user) { + CouponBatchVo checkPressResult = wxCouponBatchService.getCouponPressBatch(counpon, user.getId()); + if (null != checkPressResult) { + WxCouponBatch pressBatch = checkPressResult.getCouponBatch(); + List cids = checkPressResult.getCouponIdList(); + if (null != cids && cids.size() > 0 ) { + couponOrderQ.setCouponIds(cids); + //判断这些券发起中+已完成的 + WxOrder orderq = new WxOrder(); + orderq.updateTenantInfo(counpon); + orderq.setCouponIds(cids); + orderq.setCUserId(user.getId()); + List statusS = new ArrayList(); + statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode()); + orderq.setStatusS(statusS); + int _count = wxOrderMapper.countCouponConditionType1(orderq); + if (_count >= pressBatch.getAllowCount()) { + throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"当前用户购买次数已批次超限.["+pressBatch.getName()+"]"); + } + + if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { + couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); + } + couponOrderQ.setCouponId(counpon.getId()); + }else { + throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"券批次["+pressBatch.getName()+"]未设置券."); + } + }else { + if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { + couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); + } + couponOrderQ.setCouponId(counpon.getId()); + } + } /** * 商户注券减库存 diff --git a/mallinkService/src/main/resources/mapper/WxCouponBatchItemMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponBatchItemMapper.xml new file mode 100644 index 000000000..4dafcdb2a --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxCouponBatchItemMapper.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + `id`, `tenant_id`, `parent_tenant_id`, `coupon_batch_id`, `coupon_id`, `create_date`,`update_date`,`coupon_batch_status` + + + + where `tenant_id` = #{tenantId} + + + and `id` = #{id} + + + + and `parent_tenant_id` = #{parentTenantId} + + + + and `press_batch_id` = #{pressBatchId} + + + + and `coupon_id` = #{couponId} + + + + and `press_batch_status` = #{pressBatchStatus} + + + + and `id` in + + #{idItem} + + + + + + + + + + + + + update wx_coupon_batch_item set coupon_batch_status = #{couponBatchStatus} where `coupon_batch_id` = #{couponBatchId} and tenant_id=#{tenantId} + + + + delete from wx_coupon_batch_item where `id` = #{id} and tenant_id=#{tenantId} + + + + delete from wx_coupon_batch_item where `coupon_batch_id` = #{couponBatchId} and tenant_id=#{tenantId} + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponBatchMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponBatchMapper.xml new file mode 100644 index 000000000..0ef271efb --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxCouponBatchMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + `id`, `tenant_id`, `parent_tenant_id`, `name`, `status`, `create_date`,`update_date`,`allow_count` + + + + where `tenant_id` = #{tenantId} + + + and `id` = #{id} + + + + and `parent_tenant_id` = #{parentTenantId} + + + + and `status` = #{status} + + + + and `name` like concat('%', #{name},'%') + + + + and `id` in + + #{idItem} + + + + + + + + + + + update wx_coupon_batch set status = #{status} where `id` = #{id} and tenant_id=#{tenantId} + + + + delete from wx_coupon_batch where `id` = #{id} and tenant_id=#{tenantId} + +