Browse Source

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

release_toaliyun_real
xiaohanzi 4 years ago
parent
commit
d372d2f4cb
6 changed files with 215 additions and 4 deletions
  1. +200
    -0
      mallinkAdmin/src/main/resources/db/migration/V2021092300001__wx_coupon_order.sql
  2. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  3. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  4. +3
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  6. +7
    -3
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 200
- 0
mallinkAdmin/src/main/resources/db/migration/V2021092300001__wx_coupon_order.sql View File

@@ -0,0 +1,200 @@
ALTER TABLE `mallink`.`wx_coupon_order_0`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_1`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_2`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_3`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_4`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_5`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_6`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_7`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_8`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_9`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_10`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_11`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_12`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_13`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_14`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_15`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_16`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_17`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_18`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_19`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_20`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_21`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_22`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_23`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_24`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_25`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_26`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_27`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_28`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_29`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_30`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_31`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_32`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_33`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_34`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_35`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_36`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_37`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_38`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_39`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_40`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_41`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_42`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_43`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_44`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_45`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_46`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_47`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_48`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_49`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_50`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_51`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_52`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_53`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_54`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_55`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_56`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_57`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_58`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_59`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_60`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_61`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_62`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_63`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_64`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_65`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_66`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_67`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_68`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_69`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_70`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_71`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_72`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_73`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_74`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_75`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_76`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_77`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_78`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_79`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_80`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_81`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_82`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_83`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_84`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_85`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_86`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_87`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_88`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_89`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_90`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_91`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_92`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_93`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_94`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_95`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_96`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_97`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_98`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;
ALTER TABLE `mallink`.`wx_coupon_order_99`
ADD COLUMN `shipping_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '配送状态 0:默认(无) 1*:自提 2*:配送' AFTER `shipping_type`;

+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java View File

@@ -171,6 +171,7 @@ public class WxCouponOrderController extends BaseController {
wxCouponOrderCVo.setTitle(wxCouponCVo.getTitle()); wxCouponOrderCVo.setTitle(wxCouponCVo.getTitle());
wxCouponOrderCVo.setSubTitle(wxCouponCVo.getSubTitle()); wxCouponOrderCVo.setSubTitle(wxCouponCVo.getSubTitle());
wxCouponOrderCVo.setSalePrice(wxCouponCVo.getSalePrice()); wxCouponOrderCVo.setSalePrice(wxCouponCVo.getSalePrice());
wxCouponOrderCVo.setFreightPrice(wxCouponCVo.getFreightPrice());
wxCouponOrderCVo.setUsePrice(wxCouponCVo.getUsePrice()); wxCouponOrderCVo.setUsePrice(wxCouponCVo.getUsePrice());
wxCouponOrderCVo.setPrice(wxCouponCVo.getPrice()); wxCouponOrderCVo.setPrice(wxCouponCVo.getPrice());
wxCouponOrderCVo.setUnit(wxCouponCVo.getUnit()); wxCouponOrderCVo.setUnit(wxCouponCVo.getUnit());


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java View File

@@ -154,6 +154,7 @@ public class WxCouponOrderController extends BaseController {
wxCouponOrderCVo.setTitle(wxCouponCVo.getTitle()); wxCouponOrderCVo.setTitle(wxCouponCVo.getTitle());
wxCouponOrderCVo.setSubTitle(wxCouponCVo.getSubTitle()); wxCouponOrderCVo.setSubTitle(wxCouponCVo.getSubTitle());
wxCouponOrderCVo.setSalePrice(wxCouponCVo.getSalePrice()); wxCouponOrderCVo.setSalePrice(wxCouponCVo.getSalePrice());
wxCouponOrderCVo.setFreightPrice(wxCouponCVo.getFreightPrice());
wxCouponOrderCVo.setUsePrice(wxCouponCVo.getUsePrice()); wxCouponOrderCVo.setUsePrice(wxCouponCVo.getUsePrice());
wxCouponOrderCVo.setPrice(wxCouponCVo.getPrice()); wxCouponOrderCVo.setPrice(wxCouponCVo.getPrice());




+ 3
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java View File

@@ -1,6 +1,5 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@@ -148,6 +147,9 @@ public class WxCouponOrder extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType") @io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType")
private Integer shippingType; private Integer shippingType;


@io.swagger.annotations.ApiModelProperty(value="配送状态 0:默认(无) 1*:自提 2*:配送",name="shippingStatus")
private Integer shippingStatus;

@io.swagger.annotations.ApiModelProperty(value="配送信息",name="deliveryInfo") @io.swagger.annotations.ApiModelProperty(value="配送信息",name="deliveryInfo")
private String deliveryInfo; private String deliveryInfo;




+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java View File

@@ -286,6 +286,9 @@ public class WxCouponServiceImpl implements WxCouponService {
if (StringUtils.isNotEmpty(record.getSalePriceStr())) { if (StringUtils.isNotEmpty(record.getSalePriceStr())) {
record.setSalePrice(new BigDecimal(record.getSalePriceStr()).multiply(new BigDecimal(100)).intValue()); record.setSalePrice(new BigDecimal(record.getSalePriceStr()).multiply(new BigDecimal(100)).intValue());
} }
if (StringUtils.isNotEmpty(record.getFreightPriceStr())) {
record.setFreightPrice(new BigDecimal(record.getFreightPriceStr()).multiply(new BigDecimal(100)).intValue());
}
if (StringUtils.isNotEmpty(record.getUsePriceStr())) { if (StringUtils.isNotEmpty(record.getUsePriceStr())) {
record.setUsePrice(new BigDecimal(record.getUsePriceStr()).multiply(new BigDecimal(100)).intValue()); record.setUsePrice(new BigDecimal(record.getUsePriceStr()).multiply(new BigDecimal(100)).intValue());
} }


+ 7
- 3
mallinkService/src/main/resources/mapper/WxCouponMapper.xml View File

@@ -12,6 +12,7 @@
<result column="title" jdbcType="VARCHAR" property="title"/> <result column="title" jdbcType="VARCHAR" property="title"/>
<result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/>
<result column="sale_price" jdbcType="INTEGER" property="salePrice"/> <result column="sale_price" jdbcType="INTEGER" property="salePrice"/>
<result column="freight_price" jdbcType="INTEGER" property="freightPrice"/>
<result column="use_price" jdbcType="INTEGER" property="usePrice"/> <result column="use_price" jdbcType="INTEGER" property="usePrice"/>
<result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/> <result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/>
<result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/> <result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/>
@@ -64,6 +65,7 @@
<result column="title" jdbcType="VARCHAR" property="title"/> <result column="title" jdbcType="VARCHAR" property="title"/>
<result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/>
<result column="sale_price" jdbcType="INTEGER" property="salePrice"/> <result column="sale_price" jdbcType="INTEGER" property="salePrice"/>
<result column="freight_price" jdbcType="INTEGER" property="freightPrice"/>
<result column="use_price" jdbcType="INTEGER" property="usePrice"/> <result column="use_price" jdbcType="INTEGER" property="usePrice"/>
<result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/> <result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/>
<result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/> <result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/>
@@ -105,7 +107,7 @@


<sql id="allColumns"> <sql id="allColumns">
distinct c.`id`,c.`tenant_id`,c.`parent_tenant_id`,c.`type`,c.`cover_img`,c.`cover_picture`,c.`detail_picture`, 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_rule`,c.`use_limit_quantity`,c.`send_type`,
c.`title`,c.`sub_title`,c.`sale_price`,c.`freight_price`,c.`use_price`,c.`use_limit_rule`,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.`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.`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.`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`,
@@ -605,6 +607,7 @@
<result column="title" jdbcType="VARCHAR" property="title"/> <result column="title" jdbcType="VARCHAR" property="title"/>
<result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/>
<result column="sale_price" jdbcType="INTEGER" property="salePrice"/> <result column="sale_price" jdbcType="INTEGER" property="salePrice"/>
<result column="freight_price" jdbcType="INTEGER" property="freightPrice"/>
<result column="use_price" jdbcType="INTEGER" property="usePrice"/> <result column="use_price" jdbcType="INTEGER" property="usePrice"/>
<result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/> <result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/>
<result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/> <result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/>
@@ -654,6 +657,7 @@
<result column="title" jdbcType="VARCHAR" property="title"/> <result column="title" jdbcType="VARCHAR" property="title"/>
<result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/>
<result column="sale_price" jdbcType="INTEGER" property="salePrice"/> <result column="sale_price" jdbcType="INTEGER" property="salePrice"/>
<result column="freight_price" jdbcType="INTEGER" property="freightPrice"/>
<result column="use_price" jdbcType="INTEGER" property="usePrice"/> <result column="use_price" jdbcType="INTEGER" property="usePrice"/>
<result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/> <result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/>
<result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/> <result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/>
@@ -898,7 +902,7 @@
</select> </select>


<select id="findPressData" resultMap="statisMap"> <select id="findPressData" resultMap="statisMap">
select c.id,c.tenant_id, c.`cover_img`,c.`title`,c.`sale_price`,c.`price`,
select c.id,c.tenant_id, c.`cover_img`,c.`title`,c.`sale_price`,c.`freight_price`,c.`price`,
ifnull(op.press_count,0) as press_count, ifnull(op.press_count,0) as press_count,
ifnull(o.press_succ_count,0) as press_succ_count, ifnull(o.press_succ_count,0) as press_succ_count,
ifnull(op2.join_count,0) as join_count, ifnull(op2.join_count,0) as join_count,
@@ -1157,7 +1161,7 @@
<select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" <select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic"
resultType="com.iformall.domain.po.WxCoupon"> resultType="com.iformall.domain.po.WxCoupon">
select ct.id as id,wc.id as couponId, 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_rule`,wc.`use_limit_quantity`,wc.`send_type`,
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.`freight_price`,wc.`use_price`,wc.`use_limit_rule`,wc.`use_limit_quantity`,wc.`send_type`,
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.`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.`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.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`,wc.`conditions`,


Loading…
Cancel
Save