Browse Source

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

release_toaliyun_real
xhxu 4 years ago
parent
commit
f524696d79
16 changed files with 917 additions and 139 deletions
  1. +810
    -0
      mallinkAdmin/src/main/resources/db/migration/V2022012000001__optimize.sql
  2. +0
    -66
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  3. +5
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  4. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBatchOrderMapper.java
  6. +0
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java
  7. +0
    -8
      mallinkService/src/main/java/com/iformall/service/WxOrderService.java
  8. +39
    -24
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  9. +2
    -1
      mallinkService/src/main/java/com/iformall/service/order/OrderAdapterService.java
  10. +2
    -1
      mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java
  11. +14
    -26
      mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java
  12. +5
    -2
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java
  13. +3
    -2
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java
  14. +4
    -2
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java
  15. +4
    -2
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/OneNumberOneOrderBatchOrderAdapterService.java
  16. +23
    -1
      mallinkService/src/main/resources/mapper/WxBatchOrderMapper.xml

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

@@ -199,3 +199,813 @@ UPDATE wx_coupon_order_96 co, wx_merchant_b_user bu SET co.`b_merchant_id` =
UPDATE wx_coupon_order_97 co, wx_merchant_b_user bu SET co.`b_merchant_id` = bu.`merchant_id` WHERE co.`b_user_id` = bu.`id`;
UPDATE wx_coupon_order_98 co, wx_merchant_b_user bu SET co.`b_merchant_id` = bu.`merchant_id` WHERE co.`b_user_id` = bu.`id`;
UPDATE wx_coupon_order_99 co, wx_merchant_b_user bu SET co.`b_merchant_id` = bu.`merchant_id` WHERE co.`b_user_id` = bu.`id`;


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


UPDATE wx_order_0 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_1 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_2 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_3 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_4 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_5 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_6 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_7 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_8 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_9 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_10 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_11 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_12 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_13 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_14 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_15 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_16 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_17 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_18 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_19 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_20 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_21 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_22 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_23 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_24 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_25 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_26 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_27 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_28 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_29 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_30 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_31 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_32 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_33 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_34 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_35 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_36 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_37 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_38 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_39 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_40 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_41 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_42 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_43 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_44 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_45 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_46 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_47 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_48 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_49 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_50 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_51 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_52 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_53 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_54 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_55 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_56 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_57 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_58 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_59 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_60 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_61 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_62 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_63 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_64 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_65 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_66 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_67 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_68 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_69 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_70 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_71 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_72 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_73 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_74 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_75 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_76 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_77 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_78 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_79 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_80 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_81 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_82 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_83 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_84 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_85 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_86 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_87 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_88 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_89 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_90 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_91 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_92 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_93 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_94 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_95 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_96 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_97 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
UPDATE wx_order_98 SET compose_order_id = id WHERE compose_order_type = 0 AND compose_order_type = 0 ;
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;


+ 0
- 66
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java View File

@@ -237,72 +237,6 @@ public class BaseController {
return null;
}


public Long saveToBasicInfoByCUser(String userPhone,String userName,String avatarUrl,Integer sex,Long userId) {
TenantEntity tenantEntity = getTenantInfo();
if (StringUtils.isBlank(userPhone))
return null;

WxCUserBasicInfo byId = null;
if (null != userId) {
byId = wxCUserBasicInfoService.getById(userId,getFinalTenantId());
}

WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, userPhone);

if (basicInfo != null) {
if (byId != null) {
if (!byId.getId().equals(basicInfo.getId())) {
//数据库存在此手机号的会员,并且当前微信存在另一手机号会员
logger.error("会员" + userId + "更换手机号时,当前手机号会员表已存在:" + userPhone);
return Long.valueOf(-1);
}
}
if (!basicInfo.getTenantId().contains("," + tenantEntity.getTenantId() + ",")) {
basicInfo.setTenantId(basicInfo.getTenantId() + tenantEntity.getTenantId() + ",");
}
basicInfo.setNickName(userName);
basicInfo.setAvatarUrl(avatarUrl);
basicInfo.setSex(sex);
wxCUserBasicInfoService.update(basicInfo);
removeCacheMember(basicInfo.getId());
return basicInfo.getId();
} else {
if (byId != null) {
if (!byId.getTenantId().contains("," + tenantEntity.getTenantId() + ",")) {
byId.setTenantId(byId.getTenantId() + tenantEntity.getTenantId() + ",");
}
byId.setPhone(userPhone);
byId.setNickName(userName);
byId.setAvatarUrl(avatarUrl);
byId.setSex(sex);
wxCUserBasicInfoService.update(byId);
removeCacheMember(byId.getId());
return byId.getId();
} else {
basicInfo = new WxCUserBasicInfo();
basicInfo.setTenantId("," + tenantEntity.getTenantId() + ",");
basicInfo.setFinalTenantId(tenantEntity.getFinalTenantId());
basicInfo.setPhone(userPhone);
basicInfo.setNickName(userName);
basicInfo.setAvatarUrl(avatarUrl);
basicInfo.setSex(sex);
wxCUserBasicInfoService.save(basicInfo);
removeCacheMember(basicInfo.getId());

// 首次授权, 增加成长值及积分
// 成长值
wxScoreRulesService.addScore(tenantEntity, EnumScoreType.WECHAT_PHONE, basicInfo);
// 增加积分
wxCUserBasicInfoService.addCredit(basicInfo.getId(),tenantEntity,EnumScoreType.WECHAT_PHONE);
// 外部注券
memCouponFromDspService.couponOrderFromDsp(tenantEntity, userPhone);

return basicInfo.getId();
}
}
}

public String getIpAddr() {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String ipaddress = IPUtil.getIpAddr(request);


+ 5
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java View File

@@ -197,7 +197,10 @@ public class WxPayOrderController extends BaseController {
WxComposeOrder composeOrder = orderFactory.getOrderAdapterService(payOrder.getComposeOrder()).getComposeOrder(payOrder.getOrderId(), payOrder.getTenantId());
//查询微信订单状态并更新
check(composeOrder,payOrder);
boolean hasCompleted = hasCompleted(composeOrder,payOrder);
if (hasCompleted) {
return new ResultData(Result.SUCCESS, "支付状态更新成功", composeOrder);
}
WxAppinfo appInfo = wxAppinfoService.getCAppInfo(payOrder, EnumPayWay.getEnum(payOrder.getPayVendor()).getPlat());
//WxCUser user = getUser();
@@ -231,7 +234,7 @@ public class WxPayOrderController extends BaseController {
}
}
private boolean check(WxComposeOrder composeOrder,WxPayOrder payOrder) {
private boolean hasCompleted(WxComposeOrder composeOrder,WxPayOrder payOrder) {
if (EnumComposeOrder.isSingle(composeOrder.getComposeOrderType())) {
WxOrder order = composeOrder.getSingleOrder();
if (null == order) {


+ 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);
}

+ 0
- 8
mallinkService/src/main/java/com/iformall/service/WxOrderService.java View File

@@ -191,14 +191,6 @@ public interface WxOrderService {

void updateOrderGroupStatusByCouponChannelId(Long id, TenantEntity tenantEntity, Integer code);


/**
* 下订单
* @param user
* @param coupon
* @return
*/
WxComposeOrder saveOrderForCoupon(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,WxCUserBasicInfo user, List<OrderComposeSaveDto> orderSave,EnumPayWay payWay);
void sendOrderSuccessActionMsg(WxOrder updateOrder);

/**


+ 39
- 24
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -2188,8 +2188,7 @@ public class WxOrderServiceImpl implements WxOrderService {
RedisTemplate<String, WxCUserBasicInfo> cUserBasicInfoRedisTemplate;

@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder saveOrderForCoupon(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay) {
public WxComposeOrder saveOrderForCoupon(TenantEntity tenantEntity,boolean allowUnPayOrder,EnumComposeOrder composeOrderType,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay) {
WxOrderServiceImpl proxy = (WxOrderServiceImpl) AopContext.currentProxy();
// 防止同一用户重复下单,1秒内
String key = new StringBuilder().append("saveComposeOrder:").append(user.getId()).toString();
@@ -2202,7 +2201,7 @@ public class WxOrderServiceImpl implements WxOrderService {
OrderAdapterService orderAdapterService = orderFactory.getOrderAdapterService(composeOrderType.getCode());
WxComposeOrder composeOrder = orderAdapterService.createDBMainOrder(user, orderSave, payWay);
WxComposeOrder composeOrder = orderAdapterService.createDBMainOrder(tenantEntity,user, orderSave, payWay);
WxOrder lastOrder = null;
for (int i = 0 ; i < orderSave.size(); i ++) {
OrderComposeSaveDto orderdto = orderSave.get(i);
@@ -2314,6 +2313,9 @@ public class WxOrderServiceImpl implements WxOrderService {
}
record.setCouponNumber(couponNumber);
try {
if(EnumComposeOrder.isSingle(composeOrder.getComposeOrderType())) {
record.setId(composeOrder.getMainOrderId());
}
proxy.saveFreeOrder(record, user, coupon);
} catch (Exception e) {
logger.error("下订单错误:" + e.getMessage(),e);
@@ -2469,12 +2471,12 @@ public class WxOrderServiceImpl implements WxOrderService {
logger.error("body:" + e.getMessage());
bodyStr = "券" + '-' + EnumCouponType.getEnum(coupon.getType());
}
final IdWorker idWorker = IdWorker.get();
Long orderNumber = idWorker.nextId();
record.setId(orderNumber);
if (null == record.getId()) {
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
}
record.updateTenantInfo(coupon);
record.setOrderNumber(orderNumber);
record.setOrderNumber(record.getId());
record.setProductId(coupon.getId());
record.setCUserId(user.getId());
record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode());
@@ -2696,7 +2698,7 @@ public class WxOrderServiceImpl implements WxOrderService {
}
WxOrderServiceImpl proxy = (WxOrderServiceImpl) AopContext.currentProxy();
try {
WxComposeOrder order = proxy.saveOrderForCoupon(allowUnPayOrder,composeOrderType,wxCUserBasicInfo, composeOrderSaveDto, payWay);
WxComposeOrder order = proxy.saveOrderForCoupon(tenantEntity,allowUnPayOrder,composeOrderType,wxCUserBasicInfo, composeOrderSaveDto, payWay);
return new ResultData(order);
} catch (MallinkException e) {
logger.error("saveOrderForCoupon error.",e);
@@ -2716,23 +2718,36 @@ public class WxOrderServiceImpl implements WxOrderService {
}

//TODO 待优化重做
@Override
public PageInfo<WxOrderCouponVo> listGoodsCAsPage(WxOrder record, Integer pageIndex, Integer pageSize) {
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
- 1
mallinkService/src/main/java/com/iformall/service/order/OrderAdapterService.java View File

@@ -4,6 +4,7 @@ import java.util.List;

import com.iformall.domain.dto.OrderComposeSaveDto;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumPayWay;
import com.iformall.service.order.entity.WxComposeChildOrderPrice;
import com.iformall.service.order.entity.WxComposeOrder;
@@ -14,7 +15,7 @@ public interface OrderAdapterService {
* 数据库创建组合主订单,不是wxOrder.单个的模式不用创建
* @return
*/
WxComposeOrder createDBMainOrder(WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay);
WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay);
/**
* 获取支付时商品名称,供服务商API使用


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeOrder.java View File

@@ -1,5 +1,6 @@
package com.iformall.service.order.entity;

import com.iformall.domain.po.WxBatchOrder;
import com.iformall.domain.po.WxOrder;
import com.iformall.domain.po.base.TenantEntity;

@@ -24,6 +25,6 @@ public class WxComposeOrder extends TenantEntity{
private WxOrder singleOrder;//单个模式时不用重复查询
private Object mainOrder;//真正的主订单对象,批量下单时才有
private WxBatchOrder mainOrder;//真正的主订单对象,批量下单时才有
}

+ 14
- 26
mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java View File

@@ -1,21 +1,28 @@
package com.iformall.service.order.impl;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import com.iformall.common.IdWorker;
import com.iformall.domain.dto.OrderComposeSaveDto;
import com.iformall.enums.EnumComposeOrder;
import com.iformall.enums.EnumOrderShopingType;
import com.iformall.enums.EnumPayWay;
import com.iformall.mapper.WxBatchOrderMapper;
import com.iformall.mapper.WxOrderMapper;
import com.iformall.service.order.OrderAdapterService;
import com.iformall.service.order.entity.WxComposeChildOrderPrice;
import com.iformall.service.order.entity.WxComposeOrder;
import com.iformall.service.order.impl.batch.BaseBatchOrderAdapterService;
import com.iformall.service.order.util.OrderHelper;

/**
@@ -24,15 +31,17 @@ import com.iformall.service.order.util.OrderHelper;
*
*/
@Service
public class SingleOrderAdapterService implements OrderAdapterService {
public class SingleOrderAdapterService extends BaseBatchOrderAdapterService {
@Autowired
WxOrderMapper wxOrderMapper;
@Autowired
WxBatchOrderMapper wxBatchOrderMapper;

@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrder(WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay) {
return new WxComposeOrder(0L, EnumComposeOrder.SINGLE.getCode(),0);
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay) {
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay, EnumComposeOrder.SINGLE);
}
@Override
@@ -43,26 +52,13 @@ public class SingleOrderAdapterService implements OrderAdapterService {

@Override
public WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId) {
//mainOrderId(WxBatchOrder的id) 和 wxOrder的id一致
WxComposeOrder corder = super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.SINGLE);
WxOrder wxOrder = wxOrderMapper.selectById(mainOrderId, tenantId);
WxComposeOrder corder = new WxComposeOrder(wxOrder.getId(),EnumComposeOrder.SINGLE.getCode(),wxOrder.getPayment());
corder.updateTenantInfo(wxOrder);
corder.setSingleOrder(wxOrder);
return corder;
}
@Override
public WxComposeChildOrderPrice getChildCouponOrderPrice(OrderComposeSaveDto orderdto,WxCoupon coupon, boolean isPress, Long orderGroupId,
Integer couponNumber) {
Integer perPrice = OrderHelper.getCouponPerPayment(coupon, isPress, orderGroupId);
Integer freightPrice = 0;
//在线配送加上运费
if (EnumOrderShopingType.DISTRIBUTION.getCode().equals(orderdto.getShippingType())) {
freightPrice = coupon.getFreightPrice();
}
return new WxComposeChildOrderPrice(perPrice, couponNumber,freightPrice, coupon.getId());
}

@Override
public List<WxOrder> getChildOrders(WxComposeOrder composeOrder, String tenantId) {
List<WxOrder> childOrders = new ArrayList<WxOrder>();
@@ -70,14 +66,6 @@ public class SingleOrderAdapterService implements OrderAdapterService {
return childOrders;
}

@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public void updateChildOrdersCUserId(WxComposeOrder composeOrder,List<WxOrder> orderList, Long cUserId) {
WxOrder order = composeOrder.getSingleOrder();
order.setCUserId(cUserId);
wxOrderMapper.updateCUserId(order);
}

@Override
public Integer calcuteChildOrderSubsidy(WxCoupon coupon) {
return coupon.getSubsidyNum();


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

@@ -60,11 +60,12 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic
}
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
protected WxComposeOrder createDBMainOrder(WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay,EnumComposeOrder composeOrderType) {
protected WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay,EnumComposeOrder composeOrderType) {
WxBatchOrder order =new WxBatchOrder();
final IdWorker idWorker = IdWorker.get();
order.setId(idWorker.nextId());
order.setCUserId(user.getId());
order.updateTenantInfo(tenantEntity);
int payment = 0;
for (OrderComposeSaveDto ocsd : orderSave) {
boolean isPress = ocsd.getSignleOrder().isPressOrder();
@@ -73,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);
@@ -98,7 +101,7 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public void updateChildOrdersCUserId(WxComposeOrder composeOrder,List<WxOrder> orderList, Long cUserId) {
if (null != cUserId) {
WxBatchOrder order = (WxBatchOrder) composeOrder.getMainOrder();
WxBatchOrder order = composeOrder.getMainOrder();
order.setCUserId(cUserId);
wxBatchOrderMapper.updateCUserId(order);


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

@@ -6,6 +6,7 @@ import java.util.List;
import com.aliyun.openservices.shade.com.alibaba.fastjson.JSON;
import com.iformall.common.ErrorCode;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import org.apache.commons.lang3.StringUtils;
@@ -29,8 +30,8 @@ public class CouponPackageOrderAdapterService extends BaseBatchOrderAdapterServi
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrder(WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay) {
return super.createDBMainOrder(user, orderSave, payWay, EnumComposeOrder.PACKAGECOUPON);
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay) {
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay, EnumComposeOrder.PACKAGECOUPON);
}

@Override


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

@@ -4,6 +4,8 @@ package com.iformall.service.order.impl.batch;
import java.util.List;

import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;

import org.springframework.stereotype.Service;

import com.iformall.domain.dto.OrderComposeSaveDto;
@@ -25,9 +27,9 @@ public class MulityNumberOneOrderBatchOrderAdapterService extends BaseBatchOrder
}

@Override
public WxComposeOrder createDBMainOrder(WxCUserBasicInfo user, List<OrderComposeSaveDto> orderSave,
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user, List<OrderComposeSaveDto> orderSave,
EnumPayWay payWay) {
return super.createDBMainOrder(user, orderSave, payWay, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH);
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH);
}

@Override


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

@@ -3,6 +3,8 @@ package com.iformall.service.order.impl.batch;
import java.util.List;

import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;

import org.springframework.stereotype.Service;

import com.iformall.domain.dto.OrderComposeSaveDto;
@@ -24,9 +26,9 @@ public class OneNumberOneOrderBatchOrderAdapterService extends BaseBatchOrderAda
}

@Override
public WxComposeOrder createDBMainOrder(WxCUserBasicInfo user, List<OrderComposeSaveDto> orderSave,
public WxComposeOrder createDBMainOrder(TenantEntity tenantEntity,WxCUserBasicInfo user, List<OrderComposeSaveDto> orderSave,
EnumPayWay payWay) {
return super.createDBMainOrder(user, orderSave, payWay, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH);
return super.createDBMainOrder(tenantEntity,user, orderSave, payWay, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH);
}

@Override


+ 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