Browse Source

fix orderMapper

release_toaliyun_real
winter 4 years ago
parent
commit
b69a2ecbba
7 changed files with 662 additions and 19 deletions
  1. +603
    -0
      mallinkAdmin/src/main/resources/db/migration/V2022012000001__optimize.sql
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBatchOrderMapper.java
  4. +0
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java
  5. +28
    -16
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java
  7. +23
    -1
      mallinkService/src/main/resources/mapper/WxBatchOrderMapper.xml

+ 603
- 0
mallinkAdmin/src/main/resources/db/migration/V2022012000001__optimize.sql View File

@@ -405,4 +405,607 @@ UPDATE wx_order_98 SET compose_order_id = id WHERE compose_order_type = 0 A
UPDATE wx_order_99 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;


ALTER TABLE `mallink`.`wx_batch_order_0`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_1`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_2`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_3`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_4`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_5`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_6`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_7`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_8`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_9`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_10`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_11`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_12`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_13`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_14`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_15`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_16`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_17`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_18`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_19`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_20`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_21`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_22`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_23`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_24`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_25`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_26`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_27`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_28`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_29`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_30`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_31`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_32`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_33`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_34`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_35`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_36`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_37`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_38`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_39`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_40`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_41`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_42`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_43`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_44`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_45`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_46`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_47`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_48`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_49`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_50`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_51`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_52`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_53`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_54`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_55`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_56`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_57`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_58`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_59`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_60`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_61`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_62`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_63`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_64`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_65`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_66`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_67`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_68`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_69`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_70`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_71`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_72`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_73`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_74`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_75`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_76`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_77`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_78`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_79`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_80`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_81`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_82`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_83`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_84`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_85`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_86`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_87`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_88`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_89`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_90`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_91`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_92`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_93`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_94`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_95`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_96`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_97`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_98`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;
ALTER TABLE `mallink`.`wx_batch_order_99`
ADD COLUMN `pay_vendor` int(3) COMMENT '支付渠道EnumPayWay' ;

update wx_batch_order_0 set pay_vendor=1;
update wx_batch_order_1 set pay_vendor=1;
update wx_batch_order_2 set pay_vendor=1;
update wx_batch_order_3 set pay_vendor=1;
update wx_batch_order_4 set pay_vendor=1;
update wx_batch_order_5 set pay_vendor=1;
update wx_batch_order_6 set pay_vendor=1;
update wx_batch_order_7 set pay_vendor=1;
update wx_batch_order_8 set pay_vendor=1;
update wx_batch_order_9 set pay_vendor=1;
update wx_batch_order_10 set pay_vendor=1;
update wx_batch_order_11 set pay_vendor=1;
update wx_batch_order_12 set pay_vendor=1;
update wx_batch_order_13 set pay_vendor=1;
update wx_batch_order_14 set pay_vendor=1;
update wx_batch_order_15 set pay_vendor=1;
update wx_batch_order_16 set pay_vendor=1;
update wx_batch_order_17 set pay_vendor=1;
update wx_batch_order_18 set pay_vendor=1;
update wx_batch_order_19 set pay_vendor=1;
update wx_batch_order_20 set pay_vendor=1;
update wx_batch_order_21 set pay_vendor=1;
update wx_batch_order_22 set pay_vendor=1;
update wx_batch_order_23 set pay_vendor=1;
update wx_batch_order_24 set pay_vendor=1;
update wx_batch_order_25 set pay_vendor=1;
update wx_batch_order_26 set pay_vendor=1;
update wx_batch_order_27 set pay_vendor=1;
update wx_batch_order_28 set pay_vendor=1;
update wx_batch_order_29 set pay_vendor=1;
update wx_batch_order_30 set pay_vendor=1;
update wx_batch_order_31 set pay_vendor=1;
update wx_batch_order_32 set pay_vendor=1;
update wx_batch_order_33 set pay_vendor=1;
update wx_batch_order_34 set pay_vendor=1;
update wx_batch_order_35 set pay_vendor=1;
update wx_batch_order_36 set pay_vendor=1;
update wx_batch_order_37 set pay_vendor=1;
update wx_batch_order_38 set pay_vendor=1;
update wx_batch_order_39 set pay_vendor=1;
update wx_batch_order_40 set pay_vendor=1;
update wx_batch_order_41 set pay_vendor=1;
update wx_batch_order_42 set pay_vendor=1;
update wx_batch_order_43 set pay_vendor=1;
update wx_batch_order_44 set pay_vendor=1;
update wx_batch_order_45 set pay_vendor=1;
update wx_batch_order_46 set pay_vendor=1;
update wx_batch_order_47 set pay_vendor=1;
update wx_batch_order_48 set pay_vendor=1;
update wx_batch_order_49 set pay_vendor=1;
update wx_batch_order_50 set pay_vendor=1;
update wx_batch_order_51 set pay_vendor=1;
update wx_batch_order_52 set pay_vendor=1;
update wx_batch_order_53 set pay_vendor=1;
update wx_batch_order_54 set pay_vendor=1;
update wx_batch_order_55 set pay_vendor=1;
update wx_batch_order_56 set pay_vendor=1;
update wx_batch_order_57 set pay_vendor=1;
update wx_batch_order_58 set pay_vendor=1;
update wx_batch_order_59 set pay_vendor=1;
update wx_batch_order_60 set pay_vendor=1;
update wx_batch_order_61 set pay_vendor=1;
update wx_batch_order_62 set pay_vendor=1;
update wx_batch_order_63 set pay_vendor=1;
update wx_batch_order_64 set pay_vendor=1;
update wx_batch_order_65 set pay_vendor=1;
update wx_batch_order_66 set pay_vendor=1;
update wx_batch_order_67 set pay_vendor=1;
update wx_batch_order_68 set pay_vendor=1;
update wx_batch_order_69 set pay_vendor=1;
update wx_batch_order_70 set pay_vendor=1;
update wx_batch_order_71 set pay_vendor=1;
update wx_batch_order_72 set pay_vendor=1;
update wx_batch_order_73 set pay_vendor=1;
update wx_batch_order_74 set pay_vendor=1;
update wx_batch_order_75 set pay_vendor=1;
update wx_batch_order_76 set pay_vendor=1;
update wx_batch_order_77 set pay_vendor=1;
update wx_batch_order_78 set pay_vendor=1;
update wx_batch_order_79 set pay_vendor=1;
update wx_batch_order_80 set pay_vendor=1;
update wx_batch_order_81 set pay_vendor=1;
update wx_batch_order_82 set pay_vendor=1;
update wx_batch_order_83 set pay_vendor=1;
update wx_batch_order_84 set pay_vendor=1;
update wx_batch_order_85 set pay_vendor=1;
update wx_batch_order_86 set pay_vendor=1;
update wx_batch_order_87 set pay_vendor=1;
update wx_batch_order_88 set pay_vendor=1;
update wx_batch_order_89 set pay_vendor=1;
update wx_batch_order_90 set pay_vendor=1;
update wx_batch_order_91 set pay_vendor=1;
update wx_batch_order_92 set pay_vendor=1;
update wx_batch_order_93 set pay_vendor=1;
update wx_batch_order_94 set pay_vendor=1;
update wx_batch_order_95 set pay_vendor=1;
update wx_batch_order_96 set pay_vendor=1;
update wx_batch_order_97 set pay_vendor=1;
update wx_batch_order_98 set pay_vendor=1;
update wx_batch_order_99 set pay_vendor=1;

ALTER TABLE `mallink`.`wx_batch_order_0`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_1`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_2`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_3`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_4`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_5`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_6`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_7`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_8`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_9`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_10`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_11`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_12`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_13`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_14`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_15`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_16`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_17`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_18`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_19`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_20`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_21`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_22`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_23`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_24`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_25`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_26`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_27`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_28`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_29`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_30`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_31`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_32`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_33`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_34`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_35`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_36`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_37`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_38`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_39`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_40`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_41`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_42`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_43`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_44`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_45`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_46`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_47`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_48`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_49`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_50`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_51`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_52`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_53`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_54`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_55`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_56`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_57`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_58`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_59`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_60`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_61`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_62`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_63`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_64`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_65`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_66`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_67`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_68`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_69`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_70`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_71`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_72`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_73`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_74`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_75`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_76`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_77`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_78`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_79`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_80`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_81`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_82`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_83`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_84`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_85`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_86`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_87`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_88`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_89`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_90`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_91`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_92`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_93`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_94`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_95`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_96`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_97`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_98`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;
ALTER TABLE `mallink`.`wx_batch_order_99`
ADD COLUMN `order_type` int(1) COMMENT '组合订单类型EnumComposeOrder' ;

UPDATE wx_batch_order_0 bo, wx_order_0 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_1 bo, wx_order_1 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_2 bo, wx_order_2 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_3 bo, wx_order_3 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_4 bo, wx_order_4 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_5 bo, wx_order_5 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_6 bo, wx_order_6 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_7 bo, wx_order_7 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_8 bo, wx_order_8 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_9 bo, wx_order_9 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_10 bo, wx_order_10 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_11 bo, wx_order_11 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_12 bo, wx_order_12 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_13 bo, wx_order_13 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_14 bo, wx_order_14 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_15 bo, wx_order_15 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_16 bo, wx_order_16 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_17 bo, wx_order_17 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_18 bo, wx_order_18 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_19 bo, wx_order_19 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_20 bo, wx_order_20 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_21 bo, wx_order_21 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_22 bo, wx_order_22 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_23 bo, wx_order_23 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_24 bo, wx_order_24 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_25 bo, wx_order_25 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_26 bo, wx_order_26 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_27 bo, wx_order_27 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_28 bo, wx_order_28 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_29 bo, wx_order_29 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_30 bo, wx_order_30 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_31 bo, wx_order_31 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_32 bo, wx_order_32 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_33 bo, wx_order_33 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_34 bo, wx_order_34 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_35 bo, wx_order_35 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_36 bo, wx_order_36 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_37 bo, wx_order_37 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_38 bo, wx_order_38 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_39 bo, wx_order_39 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_40 bo, wx_order_40 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_41 bo, wx_order_41 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_42 bo, wx_order_42 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_43 bo, wx_order_43 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_44 bo, wx_order_44 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_45 bo, wx_order_45 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_46 bo, wx_order_46 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_47 bo, wx_order_47 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_48 bo, wx_order_48 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_49 bo, wx_order_49 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_50 bo, wx_order_50 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_51 bo, wx_order_51 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_52 bo, wx_order_52 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_53 bo, wx_order_53 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_54 bo, wx_order_54 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_55 bo, wx_order_55 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_56 bo, wx_order_56 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_57 bo, wx_order_57 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_58 bo, wx_order_58 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_59 bo, wx_order_59 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_60 bo, wx_order_60 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_61 bo, wx_order_61 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_62 bo, wx_order_62 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_63 bo, wx_order_63 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_64 bo, wx_order_64 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_65 bo, wx_order_65 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_66 bo, wx_order_66 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_67 bo, wx_order_67 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_68 bo, wx_order_68 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_69 bo, wx_order_69 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_70 bo, wx_order_70 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_71 bo, wx_order_71 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_72 bo, wx_order_72 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_73 bo, wx_order_73 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_74 bo, wx_order_74 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_75 bo, wx_order_75 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_76 bo, wx_order_76 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_77 bo, wx_order_77 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_78 bo, wx_order_78 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_79 bo, wx_order_79 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_80 bo, wx_order_80 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_81 bo, wx_order_81 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_82 bo, wx_order_82 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_83 bo, wx_order_83 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_84 bo, wx_order_84 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_85 bo, wx_order_85 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_86 bo, wx_order_86 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_87 bo, wx_order_87 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_88 bo, wx_order_88 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_89 bo, wx_order_89 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_90 bo, wx_order_90 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_91 bo, wx_order_91 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_92 bo, wx_order_92 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_93 bo, wx_order_93 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_94 bo, wx_order_94 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_95 bo, wx_order_95 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_96 bo, wx_order_96 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_97 bo, wx_order_97 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_98 bo, wx_order_98 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;
UPDATE wx_batch_order_99 bo, wx_order_99 o SET bo.order_type=o.compose_order_type WHERE bo.id = o.compose_order_id;


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java View File

@@ -28,4 +28,8 @@ public class WxBatchOrder extends TenantEntity {
private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;
@io.swagger.annotations.ApiModelProperty(value = "支付渠道EnumPayWay", name = "payVendor")
private Integer payVendor;
@io.swagger.annotations.ApiModelProperty(value = "组合订单类型EnumComposeOrder", name = "orderType")
private Integer orderType;
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBatchOrderMapper.java View File

@@ -11,6 +11,8 @@ public interface WxBatchOrderMapper extends CommonMapper<WxBatchOrder, Long> {

List<WxBatchOrder> findList(WxBatchOrder order);
List<WxBatchOrder> findCOrderList(WxBatchOrder order);
Integer countList(WxBatchOrder order);
WxBatchOrder selectById(@Param("id")Long id,@Param("tenantId")String tenantId);


+ 0
- 2
mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java View File

@@ -67,6 +67,4 @@ public interface WxOrderMapper extends CommonMapper<WxOrder, Long> {
void updateOrderStatusForGroup(@Param("tenantId")String tenantId);
void updateCUserId(WxOrder updateOrder);

List<WxOrderCouponVo> listGoodsCAsPage(WxOrder record);
}

+ 28
- 16
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -2718,24 +2718,36 @@ public class WxOrderServiceImpl implements WxOrderService {
}

//TODO 待优化重做
@Override
public PageInfo<WxOrderCouponVo> listGoodsCAsPage(WxOrder record, Integer pageIndex, Integer pageSize) {
//TODO 待优化111111111111111111111111.此处有问题,数据不全,逻辑得跟listCUserVoAsPage一样
PageInfo<WxOrderCouponVo> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.listGoodsCAsPage(record));
page.getList().stream().forEach(oc->{
if(oc.getLevel().equals(1)){
record.setComposeOrderId(oc.getComposeOrderId());
record.setOrderStatus(oc.getOrderStatus());
PageInfo<WxOrderCouponVo> pageInfo = listCUserVoAsPage(record,1,10000,false);
List<WxOrderCouponVo> orderCouponVoList = pageInfo.getList();
//查询子订单
oc.setOrderCouponVoList(orderCouponVoList);
}
});

return page;
}
// WxBatchOrder batchOrderQ = new WxBatchOrder();
// batchOrderQ.updateTenantInfo(record);
// batchOrderQ.setPayVendor(record.getPayVendor());;
// PageInfo<WxBatchOrder> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBatchOrderMapper.findCOrderList(batchOrderQ));
// page.getList().stream().forEach(oc->{
// record.setComposeOrderId(oc.getComposeOrderId());
// record.setOrderStatus(oc.getOrderStatus());
// PageInfo<WxOrderCouponVo> pageInfo = listCUserVoAsPage(record,1,10000,false);
// List<WxOrderCouponVo> orderCouponVoList = pageInfo.getList();
//
// //查询子订单
// oc.setOrderCouponVoList(orderCouponVoList);
// });
//
// return page;
return null;
}
// private List<WxOrderCouponVo> batchOderToOrderCouponVoList(List<WxBatchOrder> batchOrderList) {
// if (null == batchOrderList || batchOrderList.size() <= 0 ) {
// return null;
// }
// for (int i = 0 ; i < batchOrderList.size(); i ++) {
// WxBatchOrder bo = batchOrderList.get(i);
// WxOrderCouponVo vo = new WxOrderCouponVo();
// }
// }
private WxCoupon singleOrderCheck(OrderSaveDto orderSaveDto,int productCount,WxCUserBasicInfo wxCUserBasicInfo,EnumPayWay payWay,TenantEntity tenantEntity,int curindex,boolean singleProduct) {
logger.info("OrderSave: " + orderSaveDto);


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java View File

@@ -74,6 +74,8 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic
}
order.setPayment(payment);
order.setPayVendor(payWay.getCode());
order.setOrderType(composeOrderType.getCode());
order.setCreateDate(new Date());
wxBatchOrderMapper.insert(order);
return new WxComposeOrder(order.getId(),composeOrderType.getCode(),payment);


+ 23
- 1
mallinkService/src/main/resources/mapper/WxBatchOrderMapper.xml View File

@@ -7,12 +7,14 @@
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" />
<result column="c_user_id" jdbcType="BIGINT" property="cUserId"/>
<result column="payment" jdbcType="INTEGER" property="payment"/>
<result column="pay_vendor" jdbcType="INTEGER" property="payVendor"/>
<result column="order_type" jdbcType="INTEGER" property="payVendor"/>
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`payment`,`create_date`,`update_date`
`id`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`payment`,`pay_vendor`,`order_type`,`create_date`,`update_date`
</sql>

<sql id="dynamicWhereConditions">
@@ -36,6 +38,10 @@
<if test=" null != payment ">
and `payment` = #{payment}
</if>
<if test=" null != payVendor ">
and `pay_vendor` = #{payVendor}
</if>

<if test=" null != ids ">
and id in
@@ -56,6 +62,22 @@
from wx_batch_order
<include refid="dynamicWhereConditions"/>
</select>
<select id="findCOrderList" parameterType="com.iformall.domain.po.WxBatchOrder" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_batch_order o
where o.c_user_id = #{cUserId} and o.`tenant_id` = #{tenantId}
<if test=" null != parentTenantId and '' != parentTenantId">
and o.`parent_tenant_id` = #{parentTenantId}
</if>
<if test="orderStatus != null">
AND o.order_status = #{orderStatus}
</if>
<if test=" null != payVendor ">
and o.pay_vendor = #{payVendor}
</if>
</select>

<select id="countList" parameterType="com.iformall.domain.po.WxBatchOrder" resultType="java.lang.Integer">
select count(1) from wx_batch_order


Loading…
Cancel
Save