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

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

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
081312f094
14 измененных файлов: 774 добавлений и 14 удалений
  1. +18
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMiniappThemeController.java
  2. +618
    -0
      mallinkAdmin/src/main/resources/db/migration/V202011300001__commodityPresell.sql
  3. +3
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java
  4. +35
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMiniappTheme.java
  6. +32
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java
  7. +0
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumCouponChannelType.java
  8. +1
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java
  9. +7
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java
  10. +4
    -0
      mallinkService/src/main/java/com/iformall/service/WxMiniappThemeService.java
  11. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMiniappThemeServiceImpl.java
  12. +12
    -4
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
  13. +20
    -4
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml
  14. +11
    -4
      mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml

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

@@ -60,8 +60,25 @@ public class WxMiniappThemeController extends BaseController {
if(wxMiniappTheme.getType() == null){
wxMiniappTheme.setType(EnumThemeType.C.getCode());
}

PageInfo<WxMiniappTheme> page = wxMiniappThemeService.listAsPage(wxMiniappTheme, pageNum, pageSize);
WxThemeMall wxThemeMall = new WxThemeMall();
wxThemeMall.setTenantId(getTenantInfo().getTenantId());
wxThemeMall.setThemeType(EnumThemeType.C.getCode());
WxThemeMall themeMall = wxMiniappThemeService.findThemeMall(wxThemeMall);
boolean updateStatus = true;
if(themeMall != null){
for (WxMiniappTheme theme:page.getList()) {
if(theme.getId().equals(themeMall.getThemeId())){
theme.setStatus(0);
updateStatus = false;
}else{
theme.setStatus(1);
}
}
}
if(updateStatus){
page.getList().get(0).setStatus(0);
}

return new ResultData(page);
}catch (Exception e){


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

@@ -0,0 +1,618 @@
--加预购菜单
INSERT INTO `mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (664, '商品预购', 604, 'Y', NULL, 1, NULL, NULL, 'commodityPresell', null, 0, 664);

--销售类型加权限
update 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, 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, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004]' where id=1;
update 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, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 904, 905, 931, 932, 951, 961]' where id=2;
update mall_sale_type set menus = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 521, 522, 523, 531, 532, 533, 591, 592, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 621, 622, 623, 624, 625, 626, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 904, 905, 931, 932]' where id=3;
update mall_sale_type set menus = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 521, 522, 523, 531, 532, 591, 601, 602, 604, 605, 606, 607, 608, 610, 611, 612, 622, 623, 624, 625, 626, 641, 642, 643, 644, 661, 662, 663, 664, 671, 672, 674, 675, 681, 682, 684, 685, 686, 691, 692, 693, 694, 695, 711, 901, 902, 904, 905, 931, 932]' where id=4;

--所有广场管理员角色加权限
INSERT INTO `mall_role_permission`(`id`, `tenant_id`, `parent_tenant_id`, `permission_id`, `role_id`)
select CEILING(RAND()*90000000000+10000000000) ,mui.tenant_id,mui.parent_tenant_id, 664,mur.role_id
from mall_user_info mui
left join mall_user_role mur on mui.id = mur.uid
where mui.is_admin = 1 and mur.role_id is not null GROUP BY mur.role_id;



ALTER TABLE `wx_coupon_0`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_1`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_2`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_3`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_4`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_5`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_6`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_7`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_8`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_9`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_10`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_11`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_12`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_13`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_14`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_15`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_16`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_17`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_18`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_19`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_20`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_21`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_22`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_23`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_24`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_25`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_26`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_27`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_28`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_29`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_30`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_31`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_32`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_33`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_34`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_35`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_36`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_37`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_38`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_39`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_40`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_41`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_42`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_43`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_44`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_45`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_46`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_47`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_48`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_49`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_50`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_51`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_52`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_53`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_54`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_55`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_56`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_57`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_58`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_59`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_60`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_61`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_62`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_63`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_64`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_65`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_66`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_67`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_68`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_69`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_70`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_71`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_72`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_73`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_74`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_75`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_76`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_77`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_78`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_79`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_80`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_81`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_82`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_83`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_84`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_85`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_86`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_87`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_88`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_89`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_90`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_91`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_92`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_93`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_94`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_95`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_96`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_97`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_98`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;

ALTER TABLE `wx_coupon_99`
ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`,
ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`,
ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`,
ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`;


+ 3
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java Просмотреть файл

@@ -42,6 +42,9 @@ public class WxMiniappThemeController extends BaseController {
wxThemeMall.setTenantId(getTenantInfo().getTenantId());
wxThemeMall.setThemeType(EnumThemeType.C.getCode());
List<WxMiniappThemeValue> valueList = wxMiniappThemeService.findTheme(wxThemeMall);
if(valueList == null || valueList.size() == 0){
valueList = wxMiniappThemeService.findDefaultList(EnumThemeType.C.getCode());
}

Map<String,WxMiniappThemeValue> map = new HashMap<String,WxMiniappThemeValue>();
for (WxMiniappThemeValue v:valueList) {


+ 35
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Просмотреть файл

@@ -47,6 +47,14 @@ public class WxCoupon extends TenantEntity {
@SortColumn(column = "price")
private String priceStr;

@TableField(exist = false)
@SortColumn(column = "tail_price")
private String tailPriceStr;

@TableField(exist = false)
@SortColumn(column = "orig_price")
private String origPriceStr;

@TableField(exist = false)
@SortColumn(column = "subsidy_num")
private String subsidyNumStr;
@@ -90,11 +98,24 @@ public class WxCoupon extends TenantEntity {
private Date validEndDate;
@io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays")
private Integer validDays;

@io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="pickStartDate")
private Date pickStartDate;
@io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="pickEndDate")
private Date pickEndDate;

@io.swagger.annotations.ApiModelProperty(value="须知",name="detail")
private String detail;
@io.swagger.annotations.ApiModelProperty(value="面额",name="price")
@Excel(name="面额(分)",width = 20,orderNum = "2")
private Integer price;

@io.swagger.annotations.ApiModelProperty(value="尾款(适用于类型9)",name="tailPrice")
private Integer tailPrice;
@io.swagger.annotations.ApiModelProperty(value="原价(适用于类型9)",name="origPrice")
private Integer origPrice;


@io.swagger.annotations.ApiModelProperty(value="单位(0:rmb分 1:小时*100)",name="unit")
private Integer unit;
@io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory")
@@ -262,6 +283,20 @@ public class WxCoupon extends TenantEntity {
return priceStr;
}

public String getTailPriceStr() {
if(tailPrice!=null) {
tailPriceStr = new BigDecimal(tailPrice).divide(new BigDecimal(100)).toString();
}
return tailPriceStr;
}

public String getOrigPriceStr() {
if(origPrice!=null) {
origPriceStr = new BigDecimal(origPrice).divide(new BigDecimal(100)).toString();
}
return origPriceStr;
}

public String getSubsidyNumStr() {
if(subsidyNum!=null) {
subsidyNumStr = new BigDecimal(subsidyNum).divide(new BigDecimal(100)).toString();


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

@@ -29,6 +29,9 @@ public class WxMiniappTheme implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;

@TableField(exist = false)
private Integer status;

@TableField(exist = false)
private List<WxMiniappThemeValue> wxMiniappThemeValue;



+ 32
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.iformall.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.iformall.common.SortColumn;
import com.iformall.domain.po.WxCouponChannel;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -42,6 +43,12 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
private Integer usePrice;
@io.swagger.annotations.ApiModelProperty(value="面额",name="price")
private Integer price;

@io.swagger.annotations.ApiModelProperty(value="尾款(适用于类型9)",name="tailPrice")
private Integer tailPrice;
@io.swagger.annotations.ApiModelProperty(value="原价(适用于类型9)",name="origPrice")
private Integer origPrice;

@io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit")
private Integer unit;

@@ -63,6 +70,11 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays")
private Integer validDays;

@io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="pickStartDate")
private Date pickStartDate;
@io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="pickEndDate")
private Date pickEndDate;

@io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice")
private Integer creditPrice;

@@ -84,6 +96,12 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
@TableField(exist = false)
private String priceStr;

@TableField(exist = false)
private String tailPriceStr;

@TableField(exist = false)
private String origPriceStr;

@TableField(exist = false)
private String qrCode;

@@ -122,6 +140,20 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
return priceStr;
}

public String getTailPriceStr() {
if(tailPrice!=null) {
tailPriceStr = new BigDecimal(tailPrice).divide(new BigDecimal(100)).toString();
}
return tailPriceStr;
}

public String getOrigPriceStr() {
if(origPrice!=null) {
origPriceStr = new BigDecimal(origPrice).divide(new BigDecimal(100)).toString();
}
return origPriceStr;
}

@Override
public String getTitle() {
return title;


+ 0
- 1
mallinkService/src/main/java/com/iformall/enums/EnumCouponChannelType.java Просмотреть файл

@@ -13,7 +13,6 @@ public enum EnumCouponChannelType {
COUPON_CHANNEL_ID_PRESS(6, "砍价频道"),
COUPON_CHANNEL_ID_ORDER_GROUP(7, "拼团频道"),
COUPON_CHANNEL_ID_TOPIC(8, "专题"),
COUPON_CHANNEL_ID_PREORDER(9, "预购商品"),
COUPON_CHANNEL_ID_CREDIT(50, "积分商城"),
COUPON_CHANNEL_ID_H5(100, "DSP的H5页面"),
;


+ 1
- 0
mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java Просмотреть файл

@@ -15,6 +15,7 @@ public enum EnumCouponType {
COUPON_MULTIMCH(6, "通用券"),
COUPON_PRESS(8, "砍价券"),
COUPON_GROUP(9, "团购券"),
COUPON_PREORDER(10, "预购商品"),
COUPON_CREDIT(50,"积分券"),
COUPON_CREDIT_PARK(51,"积分停车券"),
CARD_MULTIMCH(100, "消费卡"),


+ 7
- 0
mallinkService/src/main/java/com/iformall/mapper/WxMiniappThemeMapper.java Просмотреть файл

@@ -17,6 +17,13 @@ public interface WxMiniappThemeMapper extends CommonMapper<WxMiniappTheme, Long>

List<WxMiniappThemeValue> findChildList(Long id);

/**
* 默认主题
* @param type
* @return
*/
List<WxMiniappThemeValue> findDefaultList(Integer type);

/**
* 伪删除
* @param record


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

@@ -48,4 +48,8 @@ public interface WxMiniappThemeService {
void insertValue(WxMiniappThemeValue record);

List<WxMiniappThemeValue> findTheme(WxThemeMall wxThemeMall);

WxThemeMall findThemeMall(WxThemeMall wxThemeMall);

List<WxMiniappThemeValue> findDefaultList(Integer code);
}

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

@@ -115,4 +115,14 @@ public class WxMiniappThemeServiceImpl implements WxMiniappThemeService {
return wxMiniappThemeMapper.finThemeByThemeMall(wxThemeMall);
}

@Override
public WxThemeMall findThemeMall(WxThemeMall wxThemeMall) {
return wxThemeMallMapper.findOne(wxThemeMall);
}

@Override
public List<WxMiniappThemeValue> findDefaultList(Integer code) {
return wxMiniappThemeMapper.findDefaultList(code);
}

}

+ 12
- 4
mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml Просмотреть файл

@@ -162,8 +162,8 @@
<sql id="CouponChannelVoColumns">
<include refid="allColumns" />,
c.remain_inventory,c.inventory,c.cover_img,c.sub_title,c.sale_price,c.detail,
c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund,c.conditions,
c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.credit_price,c.content_type,c.source_type
c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund,c.conditions,
c.valid_type,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,c.valid_days,c.credit_price,c.content_type,c.source_type
</sql>

<resultMap id="CouponChannelVoMap" type="com.iformall.domain.vo.WxCouponChannelVo">
@@ -190,6 +190,8 @@
<result column="sale_price" jdbcType="INTEGER" property="salePrice"/>
<result column="use_price" jdbcType="INTEGER" property="usePrice"/>
<result column="price" jdbcType="INTEGER" property="price"/>
<result column="tail_price" jdbcType="INTEGER" property="origPrice"/>
<result column="orig_price" jdbcType="INTEGER" property="origPrice"/>
<result column="unit" jdbcType="INTEGER" property="unit"/>
<result column="detail" jdbcType="VARCHAR" property="detail"/>
<result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/>
@@ -200,6 +202,8 @@
<result column="valid_type" jdbcType="INTEGER" property="validType"/>
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/>
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>
<result column="pick_start_date" jdbcType="TIMESTAMP" property="pickStartDate"/>
<result column="pick_end_date" jdbcType="TIMESTAMP" property="pickEndDate"/>
<result column="valid_days" jdbcType="INTEGER" property="validDays"/>
<result column="qr_code" property="qrCode"/>
<result column="conditions" jdbcType="VARCHAR" property="conditions" />
@@ -253,8 +257,8 @@
<sql id="WxCouponCVoColumn">
cc.id,cc.coupon_id,cc.target_ad,cc.begin_time,cc.end_time,
c.tenant_id,c.parent_tenant_id,c.type,c.cover_img,c.cover_picture,c.detail_picture,c.title,c.sub_title,c.sale_price,c.use_price,
c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,
c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,
c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,
c.valid_days,c.detail,c.price,c.tail_price,c.orig_price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,
c.create_date,c.update_date,c.business,c.sub_business,c.support_transfer,c.press_limit_num, c.auto_refund,c.credit_price,c.conditions,c.content_type,
cc.qr_code
</sql>
@@ -286,9 +290,13 @@
<result column="valid_type" jdbcType="INTEGER" property="validType"/>
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/>
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>
<result column="pick_start_date" jdbcType="TIMESTAMP" property="pickStartDate"/>
<result column="pick_end_date" jdbcType="TIMESTAMP" property="pickEndDate"/>
<result column="valid_days" jdbcType="INTEGER" property="validDays"/>
<result column="detail" jdbcType="VARCHAR" property="detail"/>
<result column="price" jdbcType="INTEGER" property="price"/>
<result column="tail_price" jdbcType="INTEGER" property="origPrice"/>
<result column="orig_price" jdbcType="INTEGER" property="origPrice"/>
<result column="unit" jdbcType="INTEGER" property="unit"/>
<result column="remain_inventory" jdbcType="INTEGER" property="remainInventory"/>
<result column="inventory" jdbcType="INTEGER" property="inventory"/>


+ 20
- 4
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Просмотреть файл

@@ -18,9 +18,13 @@
<result column="valid_type" jdbcType="INTEGER" property="validType"/>
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/>
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>
<result column="pick_start_date" jdbcType="TIMESTAMP" property="pickStartDate"/>
<result column="pick_end_date" jdbcType="TIMESTAMP" property="pickEndDate"/>
<result column="valid_days" jdbcType="INTEGER" property="validDays"/>
<result column="detail" jdbcType="VARCHAR" property="detail"/>
<result column="price" jdbcType="INTEGER" property="price"/>
<result column="tail_price" jdbcType="INTEGER" property="origPrice"/>
<result column="orig_price" jdbcType="INTEGER" property="origPrice"/>
<result column="unit" jdbcType="INTEGER" property="unit"/>
<result column="remain_inventory" jdbcType="INTEGER" property="remainInventory"/>
<result column="inventory" jdbcType="INTEGER" property="inventory"/>
@@ -100,7 +104,7 @@
<sql id="allColumns">
distinct c.`id`,c.`tenant_id`,c.`parent_tenant_id`,c.`type`,c.`cover_img`,c.`cover_picture`,c.`detail_picture`,
c.`title`,c.`sub_title`,c.`sale_price`,c.`use_price`,c.`use_limit_quantity`,c.`send_type`,
c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`,c.`valid_days`,c.`detail`,c.`price`,c.`unit`,c.`remain_inventory`,c.`inventory`,
c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`,c.pick_start_date,c.pick_end_date,c.`valid_days`,c.`detail`,c.`price`,c.tail_price,c.orig_price,c.`unit`,c.`remain_inventory`,c.`inventory`,
c.`remark`,c.`status`,c.`create_date`,c.`update_date`,c.`business`,c.`sub_business`,c.`support_transfer`,c.`subsidy_num`,c.`subsidy_type`,
c.`press_limit_num`, c.`press_limit_hours`, c.`auto_refund`,c.`credit_price`,c.`credit_refund`,c.`put_apply_status`,c.`stock_apply_status`,c.`cancle_apply_status`,
c.`conditions`,c.approval_type,c.content_type,c.source_type,c.password_support
@@ -597,9 +601,13 @@
<result column="valid_type" jdbcType="INTEGER" property="validType"/>
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/>
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>
<result column="pick_start_date" jdbcType="TIMESTAMP" property="pickStartDate"/>
<result column="pick_end_date" jdbcType="TIMESTAMP" property="pickEndDate"/>
<result column="valid_days" jdbcType="INTEGER" property="validDays"/>
<result column="detail" jdbcType="VARCHAR" property="detail"/>
<result column="price" jdbcType="INTEGER" property="price"/>
<result column="tail_price" jdbcType="INTEGER" property="origPrice"/>
<result column="orig_price" jdbcType="INTEGER" property="origPrice"/>
<result column="unit" jdbcType="INTEGER" property="unit"/>
<result column="remain_inventory" jdbcType="INTEGER" property="remainInventory"/>
<result column="inventory" jdbcType="INTEGER" property="inventory"/>
@@ -641,9 +649,13 @@
<result column="valid_type" jdbcType="INTEGER" property="validType"/>
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/>
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>
<result column="pick_start_date" jdbcType="TIMESTAMP" property="pickStartDate"/>
<result column="pick_end_date" jdbcType="TIMESTAMP" property="pickEndDate"/>
<result column="valid_days" jdbcType="INTEGER" property="validDays"/>
<result column="detail" jdbcType="VARCHAR" property="detail"/>
<result column="price" jdbcType="INTEGER" property="price"/>
<result column="tail_price" jdbcType="INTEGER" property="origPrice"/>
<result column="orig_price" jdbcType="INTEGER" property="origPrice"/>
<result column="unit" jdbcType="INTEGER" property="unit"/>
<result column="remain_inventory" jdbcType="INTEGER" property="remainInventory"/>
<result column="inventory" jdbcType="INTEGER" property="inventory"/>
@@ -791,7 +803,9 @@
left join (<foreach collection="tenantEntitys" item="tenantEntity" index="index" separator="union all">
SELECT * from wx_coupon${tenantEntity.shardTableSuffix}
</foreach>) wc on wc.id = ci.coupon_id
left join wx_merchant_subsidy sc on sc.coupon_order_id = ci.id
left join (<foreach collection="tenantEntitys" item="tenantEntity" index="index" separator="union all">
SELECT * from wx_merchant_subsidy${tenantEntity.shardTableSuffix}
</foreach>) sc on sc.coupon_order_id = ci.id
where wc.id = c.id) as sum_subsidy

from (<foreach collection="tenantEntitys" item="tenantEntity" index="index" separator="union all">
@@ -840,7 +854,9 @@
left join (<foreach collection="tenantEntitys" item="tenantEntity" index="index" separator="union all">
SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix}
</foreach>) wo on wo.coupon_id = wc.id
left join wx_merchant_subsidy sc on sc.coupon_order_id = wo.id
left join (<foreach collection="tenantEntitys" item="tenantEntity" index="index" separator="union all">
SELECT * from wx_merchant_subsidy${tenantEntity.shardTableSuffix}
</foreach>) sc on sc.coupon_order_id = wo.id
where wc.id = c.id) as sum_subsidy
from (<foreach collection="tenantEntitys" item="tenantEntity" index="index" separator="union all">
SELECT * from wx_coupon${tenantEntity.shardTableSuffix}
@@ -1122,7 +1138,7 @@
resultType="com.iformall.domain.po.WxCoupon">
select ct.id as id,wc.id as couponId,
wc.tenant_id,wc.parent_tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`detail_picture`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`,
wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.`unit`,wc.`remain_inventory`,wc.`inventory`,
wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.pick_start_date,wc.pick_end_date,wc.`valid_days`,wc.`detail`,wc.`price`,wc.tail_price,wc.orig_price,wc.`unit`,wc.`remain_inventory`,wc.`inventory`,
wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`,
wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`,wc.`conditions`,
wc.title as couponName,wc.`cover_img` as couponPic,wc.`cover_picture` as couponPicture,wc.`detail_picture` as detailPicture,wc.id as couponId


+ 11
- 4
mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml Просмотреть файл

@@ -16,20 +16,20 @@
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`name`,`remarks`,`preview_url`,`status`,`create_date`,`update_date`
`id`,`tenant_id`,`name`,`remarks`,`preview_url`,`type`,`create_date`,`update_date`
</sql>

<sql id="dynamicWhereConditions">
where del_status = 0
<if test=" null != id "> and `id` = #{id} </if>
<if test=" null != tenantId and '' != tenantId">
and (`tenant_id` = 0 or`tenant_id` = #{tenantId})
and (`tenant_id` = 1 or`tenant_id` = #{tenantId})
</if>
<if test=" null != name and '' != name "> and `name` like concat('%', #{name},'%') </if>
<if test=" null != type">
and `type` = #{type}
</if>
order by create_date asc
order by id asc
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxMiniappTheme" resultMap="BaseResultMap">
@@ -46,6 +46,12 @@
left join wx_miniapp_theme_value mtv on mtv.miniapp_deploy_id = mtd.id and mtv.miniapp_theme_id = #{id};
</select>

<select id="findDefaultList" resultType="com.iformall.domain.po.WxMiniappThemeValue">
SELECT `name`, remarks,default_icon icon,default_style styleClass
FROM wx_miniapp_theme_deploy
where theme_type = #{themeType};
</select>

<update id="updateDel" parameterType="com.iformall.domain.po.WxMiniappTheme">
update wx_miniapp_theme set `del_status` = 1, update_date = now() where id = #{id};
</update>
@@ -73,7 +79,8 @@
FROM wx_miniapp_theme_deploy mtd
left join wx_miniapp_theme_value mtv on mtv.miniapp_deploy_id = mtd.id
left join wx_theme_mall tm on tm.theme_id = mtv.miniapp_theme_id and tm.theme_type = mtd.theme_type
where mtd.theme_type = #{themeType} and tm.tenant_id = #{tenantId}
left join wx_miniapp_theme mt on mt.id = tm.theme_id
where mtd.theme_type = #{themeType} and mt.del_status = 0 and tm.tenant_id = #{tenantId}
</select>




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