xhxu 4 лет назад
Родитель
Сommit
07120120a5
17 измененных файлов: 1206 добавлений и 42 удалений
  1. +399
    -0
      mallinkAdmin/src/main/resources/db/migration/V202108190001__add_wx_c_user_basic_info.sql
  2. +299
    -0
      mallinkAdmin/src/main/resources/db/migration/V202108190002__add_wx_c_user_basic_info.sql
  3. +12
    -0
      mallinkAdmin/src/main/resources/db/migration/V202108190003__add_tag.sql
  4. +99
    -26
      mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java
  5. +52
    -0
      mallinkService/src/main/java/com/iformall/domain/po/JmSportOrder.java
  6. +9
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java
  7. +2
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumAssignTagsTrigger.java
  8. +12
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumTag.java
  9. +7
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumTagType.java
  10. +14
    -0
      mallinkService/src/main/java/com/iformall/mapper/JmSportOrderMapper.java
  11. +21
    -0
      mallinkService/src/main/java/com/iformall/service/JmSportOrderService.java
  12. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java
  13. +48
    -0
      mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java
  14. +23
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  15. +92
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java
  16. +104
    -0
      mallinkService/src/main/resources/mapper/JmSportOrderMapper.xml
  17. +11
    -5
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

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

@@ -0,0 +1,399 @@
ALTER TABLE `mallink`.`wx_c_user_basic_info_0`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_1`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_2`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_3`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_4`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_5`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_6`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_7`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_8`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_9`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_10`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_11`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_12`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_13`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_14`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_15`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_16`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_17`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_18`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_19`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_20`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_21`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_22`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_23`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_24`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_25`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_26`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_27`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_28`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_29`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_30`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_31`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_32`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_33`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_34`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_35`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_36`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_37`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_38`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_39`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_40`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_41`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_42`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_43`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_44`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_45`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_46`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_47`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_48`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_49`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_50`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_51`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_52`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_53`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_54`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_55`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_56`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_57`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_58`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_59`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_60`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_61`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_62`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_63`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_64`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_65`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_66`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_67`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_68`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_69`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_70`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_71`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_72`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_73`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_74`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_75`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_76`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_77`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_78`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_79`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_80`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_81`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_82`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_83`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_84`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_85`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_86`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_87`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_88`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_89`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_90`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_91`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_92`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_93`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_94`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_95`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_96`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_97`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_98`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_99`
ADD COLUMN `height` varchar(10) COMMENT '高' AFTER `sex`,
ADD COLUMN `weight` varchar(10) COMMENT '重' AFTER `height`;

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

@@ -0,0 +1,299 @@
ALTER TABLE `mallink`.`wx_c_user_basic_info_0`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_1`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_2`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_3`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_4`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_5`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_6`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_7`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_8`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_9`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_10`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_11`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_12`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_13`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_14`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_15`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_16`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_17`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_18`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_19`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_20`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_21`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_22`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_23`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_24`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_25`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_26`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_27`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_28`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_29`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_30`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_31`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_32`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_33`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_34`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_35`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_36`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_37`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_38`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_39`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_40`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_41`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_42`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_43`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_44`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_45`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_46`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_47`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_48`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_49`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_50`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_51`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_52`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_53`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_54`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_55`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_56`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_57`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_58`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_59`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_60`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_61`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_62`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_63`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_64`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_65`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_66`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_67`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_68`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_69`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_70`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_71`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_72`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_73`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_74`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_75`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_76`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_77`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_78`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_79`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_80`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_81`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_82`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_83`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_84`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_85`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_86`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_87`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_88`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_89`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_90`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_91`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_92`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_93`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_94`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_95`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_96`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_97`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_98`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

ALTER TABLE `mallink`.`wx_c_user_basic_info_99`
ADD COLUMN `id_card` varchar(20) COMMENT '证件号' AFTER `weight`;

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

@@ -0,0 +1,12 @@
INSERT INTO `mallink`.`wx_tags_type`(`id`, `name`, `group_id`, `group_name`, `flag`) VALUES (30, 'BMI', 1, '基础属性', 1);

INSERT INTO `mallink`.`wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (172, '过轻', 1, '基础属性', 30, 'BMI');
INSERT INTO `mallink`.`wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (173, '标准', 1, '基础属性', 30, 'BMI');
INSERT INTO `mallink`.`wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (174, '过重', 1, '基础属性', 30, 'BMI');
INSERT INTO `mallink`.`wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (175, '肥胖', 1, '基础属性', 30, 'BMI');

INSERT INTO `mallink`.`wx_tags_type`(`id`, `name`, `group_id`, `group_name`, `flag`) VALUES (31, '运动频率', 4, '行为偏好', 1);

INSERT INTO `mallink`.`wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (176, '运动频率低', 4, '行为偏好', 31, '运动频率');
INSERT INTO `mallink`.`wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (177, '运动频率中', 4, '行为偏好', 31, '运动频率');
INSERT INTO `mallink`.`wx_tags`(`id`, `name`, `group_id`, `group_name`, `type_id`, `type_name`) VALUES (178, '运动频率高', 4, '行为偏好', 31, '运动频率');

+ 99
- 26
mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java Просмотреть файл

@@ -1,32 +1,21 @@
package com.iformall.controller.callback;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;

import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.exception.MallinkException;
import com.iformall.enums.EnumAssignTagsTrigger;
import com.iformall.service.*;
import com.iformall.service.pay.alipay.AliPayUtil;
import com.iformall.service.pay.alipay.api.enums.EnumMemberCardConfig;
import com.iformall.service.pay.alipay.api.result.UserAuthData;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
@@ -43,7 +32,20 @@ public class JinMaoController extends BaseController {

private final Logger logger = LoggerFactory.getLogger(this.getClass());

private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
private final TenantEntity tenantEntity = new TenantEntity(){{
setTenantId("1035");
}};

private final SimpleDateFormat sdf = new SimpleDateFormat("MMM d, yyyy K:m:s a", Locale.ENGLISH);

@Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService;

@Autowired
private WxCUserTagsService wxCUserTagsService;

@Autowired
private JmSportOrderService jmSportOrderService;


@@ -63,21 +65,55 @@ public class JinMaoController extends BaseController {
* register_time=Jan 21, 2021 5:58:37 PM,
* unionid=oLUeT4poGhpUKR3vPU5huMU3o-no
* }
*
* sex的1是男,2是女,3是未知
*
* 1. BMI=体重(kg)/(身高X身高)(㎡)
*  
* BMI<18.5          过轻
* 18.5<BMI<24.9     标准
* 24.9<BMI          过重
* 30<BMI            肥胖
*/
@RequestMapping(value = "/dfh/user")
@ResponseBody
public void dfhUser(@RequestBody Map param) throws IOException {
public void dfhUser(@RequestBody Map param) throws Exception {
logger.info("dfh user:"+param);
try {
String phone = param.get("phone")==null?"":param.get("phone").toString();
String userName = param.get("user_name")==null?"":param.get("user_name").toString();
Integer sex = param.get("sex")==null?0:Integer.parseInt(param.get("sex").toString());
if(sex.intValue() == 3){ sex = 0;}
String birthdayStr = param.get("birthday")==null?"":param.get("birthday").toString();
Date birthday = null;
if(StringUtils.isNotBlank(birthdayStr)){
birthday = sdf.parse(birthdayStr);
}
String idCard = param.get("id_card")==null?"":param.get("id_card").toString();
String height = param.get("height")==null?"":param.get("height").toString();
String weight = param.get("weight")==null?"":param.get("weight").toString();
String address = param.get("address")==null?"":param.get("address").toString();
String registerTimeStr = param.get("register_time")==null?"":param.get("register_time").toString();
String unionid = param.get("unionid")==null?"":param.get("unionid").toString();
if(StringUtils.isNotBlank(phone) && phone.matches("^1[0-9]{10}$")){
WxCUserBasicInfo basicInfo = new WxCUserBasicInfo();
basicInfo.setPhone(phone);
basicInfo.setNickName(userName);
basicInfo.setSex(sex);
basicInfo.setBirthdate(birthday);
basicInfo.setHeight(height);
basicInfo.setWeight(weight);
basicInfo.setIdCard(idCard);
basicInfo.setAddress(address);
wxCUserBasicInfoService.registerJinmao(tenantEntity,basicInfo);

String phone = param.get("phone")==null?"":param.get("phone").toString();
String userName = param.get("user_name")==null?"":param.get("user_name").toString();


TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId("1035");


WxCUserBasicInfo basicInfo = new WxCUserBasicInfo();
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_JINMAO_USER, basicInfo,tenantEntity);
}else{
logger.error("JinMaoController --dfhUser 手机号为空或格式不正确---phone{}"+phone);
}
}catch(Exception e){
logger.error("JinMaoController --dfhUser",e);
}

}
@@ -99,8 +135,45 @@ public class JinMaoController extends BaseController {
@RequestMapping(value = "/dfh/order")
public void dfhOrder(@RequestBody Map param) throws Exception {
logger.info("dfh order:"+param);
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId("1035");
try {
String price = param.get("price")==null?"":param.get("price").toString();
Integer num = param.get("num")==null?1:Integer.parseInt(param.get("num").toString());
String userPhone = param.get("userPhone")==null?"":param.get("userPhone").toString();
String gymName = param.get("gymName")==null?"":param.get("gymName").toString();
String payWay = param.get("payWay")==null?"":param.get("payWay").toString();
String orderId = param.get("ID")==null?"":param.get("ID").toString();
String timeStr = param.get("time")==null?"":param.get("time").toString();
Date paymentTime = null;
if(StringUtils.isNotBlank(timeStr)){
paymentTime = sdf.parse(timeStr);
}
String productName = param.get("productName")==null?"":param.get("productName").toString();
if(StringUtils.isNotBlank(userPhone) && StringUtils.isNotBlank(orderId)){
WxCUserBasicInfo basicInfo = new WxCUserBasicInfo();
basicInfo.setPhone(userPhone);
wxCUserBasicInfoService.registerJinmao(tenantEntity,basicInfo);

JmSportOrder order = new JmSportOrder();
order.updateTenantInfo(tenantEntity);
order.setOrderId(orderId);
order.setUserPhone(userPhone);
order.setUserId(basicInfo.getId());
order.setProductName(productName);
order.setNum(num);
order.setPrice(price);
order.setPaymentTime(paymentTime);
order.setPayWay(payWay);
order.setGymName(gymName);
jmSportOrderService.saveOrUpdate(order);

wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_JINMAO_ORDER, basicInfo,tenantEntity);

}else{
logger.error("JinMaoController --dfhOrder--订单手机号为空或者订单号为空-userPhone{}"+userPhone+"-orderId{}"+orderId);
}
}catch(Exception e){
logger.error("JinMaoController --dfhOrder",e);
}

}


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

@@ -0,0 +1,52 @@
package com.iformall.domain.po;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import java.util.Date;

@TableName(value = "jm_sport_order")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class JmSportOrder extends TenantEntity {

protected Long id;

private String orderId;

private String userPhone;
@io.swagger.annotations.ApiModelProperty(value="会员id",name="userId")
private Long userId;

private String productName;
private Integer num;

@io.swagger.annotations.ApiModelProperty(value="支付金额",name="price")
private String price;
@io.swagger.annotations.ApiModelProperty(value="支付时间",name="paymentTime")
private Date paymentTime;

@io.swagger.annotations.ApiModelProperty(value="支付渠道",name="way")
private String payWay;
@io.swagger.annotations.ApiModelProperty(value="消费的场馆",name="gymName")
private String gymName;

@io.swagger.annotations.ApiModelProperty(value="创建时间/砍价开始时间",name="createDate")
private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;

@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="查询-起始时间",name="startDate")
private Date startDate;

@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="endDate")
private Date endDate;

}

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

@@ -108,6 +108,15 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId {
@io.swagger.annotations.ApiModelProperty(value="邮箱",name="email")
private String email;

@io.swagger.annotations.ApiModelProperty(value="高",name="height")
private String height;

@io.swagger.annotations.ApiModelProperty(value="重",name="weight")
private String weight;

@io.swagger.annotations.ApiModelProperty(value="证件号",name="idCard")
private String idCard;

@io.swagger.annotations.ApiModelProperty(value="用户标签",name="tagId")
private Long tagId;



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

@@ -14,6 +14,8 @@ public enum EnumAssignTagsTrigger {
ASSIGN_TAGS_TRIGGER_BUY(5, "购买"),
ASSIGN_TAGS_TRIGGER_USE(6, "核销"),
ASSIGN_TAGS_TRIGGER_SCAN(7, "扫描会员列表"),
ASSIGN_TAGS_TRIGGER_JINMAO_USER(8, "金茂对接会员"),
ASSIGN_TAGS_TRIGGER_JINMAO_ORDER(9, "金茂对接订单"),
;

public static EnumAssignTagsTrigger getEnum(Integer code) {


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

@@ -211,6 +211,15 @@ public enum EnumTag {
ID_170(170L, EnumTagType.ID_29, "学龄中(12-15岁)"),
ID_171(171L, EnumTagType.ID_29, "学龄晚(15-18岁)"),

ID_172(172L, EnumTagType.ID_30, "过轻"),//BMI<18.5 
ID_173(173L, EnumTagType.ID_30, "标准"),//18.5<=BMI<24.9
ID_174(174L, EnumTagType.ID_30, "过重"),//24.9<=BMI<30
ID_175(175L, EnumTagType.ID_30, "肥胖"),//30<=BMI

ID_176(176L, EnumTagType.ID_31,"运动频率低"),
ID_177(177L, EnumTagType.ID_31,"运动频率中"),
ID_178(178L, EnumTagType.ID_31,"运动频率高"),

ID_1000(1000L, EnumTagType.ID_50,"一天以内"),
ID_1001(1001L, EnumTagType.ID_50,"一周以内"),
ID_1002(1002L, EnumTagType.ID_50,"一月以内"),
@@ -234,7 +243,9 @@ public enum EnumTag {

ID_1300(1300L, EnumTagType.ID_54,"今天核销"),
ID_1301(1301L, EnumTagType.ID_54,"本周核销"),
ID_1302(1302L, EnumTagType.ID_54,"当月核销"),;
ID_1302(1302L, EnumTagType.ID_54,"当月核销"),

;

private static Map<Long,EnumTag> map = new HashMap<Long,EnumTag>();
static {


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

@@ -12,18 +12,21 @@ public enum EnumTagType {
ID_5(5L, EnumTagTypeFlag.FLAG_NORMAL, EnumTagGroup.ID_1, "来源"),
ID_6(6L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_1, "学历"),
ID_7(7L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_1, "手机运营商"),

ID_8(8L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "月收入"),
ID_9(9L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "手机品牌"),
ID_10(10L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "婚姻家庭"),
ID_11(11L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "车辆情况"),
ID_12(12L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "职业"),
ID_13(13L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "住房情况"),

ID_14(14L, EnumTagTypeFlag.FLAG_NORMAL, EnumTagGroup.ID_3, "消费类别"),
ID_15(15L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_3, "消费档次"),
ID_16(16L, EnumTagTypeFlag.FLAG_NORMAL, EnumTagGroup.ID_3, "品牌偏好"),
ID_17(17L, EnumTagTypeFlag.FLAG_NORMAL, EnumTagGroup.ID_3, "饮食偏好"),
ID_18(18L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_3, "消费时间段"),
ID_19(19L, EnumTagTypeFlag.FLAG_NORMAL, EnumTagGroup.ID_3, "支付习惯"),

ID_20(20L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_4, "会员消费观"),
ID_21(21L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_4, "消费频率"),
ID_22(22L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_4, "活跃度"),
@@ -37,6 +40,10 @@ public enum EnumTagType {

ID_29(29L, EnumTagTypeFlag.FLAG_NORMAL, EnumTagGroup.ID_2, "子女"),

ID_30(30L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_1, "BMI"),

ID_31(31L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_4, "运动频率"),

ID_0(0L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_10, "会员手机"),
ID_50(50L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_10, "会员会龄"),
ID_51(51L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_10, "会员等级"),


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

@@ -0,0 +1,14 @@
package com.iformall.mapper;

import com.iformall.common.CommonMapper;
import com.iformall.domain.po.JmSportOrder;

import java.util.List;

public interface JmSportOrderMapper extends CommonMapper<JmSportOrder, Long> {

List<JmSportOrder> findList(JmSportOrder record);

Integer findCount(JmSportOrder record);

}

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

@@ -0,0 +1,21 @@
package com.iformall.service;

import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.JmSportOrder;


public interface JmSportOrderService {

/**
* 根据实体查询分页列表
*
* @param record
* @param pageIndex
* @param pageSize
* @return
*/
PageInfo<JmSportOrder> listAsPage(JmSportOrder record, Integer pageIndex, Integer pageSize);

void saveOrUpdate(JmSportOrder record);

}

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

@@ -178,5 +178,7 @@ public interface WxCUserBasicInfoService {
WxCUserBasicInfo registerByPhone(TenantEntity tenantEntity, String phone, String nickName, Integer sex, String avatarUrl);

int addCredit(Long userId, TenantEntity tenantInfo, EnumScoreType wechatPhone);

void registerJinmao(TenantEntity tenantInfo,WxCUserBasicInfo basicInfo);
}


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

@@ -0,0 +1,48 @@
package com.iformall.service.impl;

import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.iformall.common.IdWorker;
import com.iformall.domain.po.JmSportOrder;
import com.iformall.domain.po.MemCouponFromDsp;
import com.iformall.mapper.*;
import com.iformall.service.JmSportOrderService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;


@Service
public class JmSportOrderServiceImpl implements JmSportOrderService {

private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired
private JmSportOrderMapper jmSportOrderMapper;

@Override
public PageInfo<JmSportOrder> listAsPage(JmSportOrder record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> jmSportOrderMapper.findList(record));
}

@Override
public void saveOrUpdate(JmSportOrder record) {
Date curDate = new Date();
if (record.getId() == null) {
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
record.setCreateDate(curDate);
record.setUpdateDate(curDate);
jmSportOrderMapper.insert(record);
} else {
record.setUpdateDate(curDate);
jmSportOrderMapper.updateById(record);
}
}


}

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

@@ -653,16 +653,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
basicInfo.setAvatarUrl(avatarUrl);
this.save(basicInfo);
}else{
if(StringUtils.isNotBlank(nickName)){
basicInfo.setNickName(nickName);
}
if(sex != null){
basicInfo.setSex(sex);
}
if(StringUtils.isNotBlank(avatarUrl)){
basicInfo.setAvatarUrl(avatarUrl);
}
wxCUserBasicInfoMapper.updateById(basicInfo);
WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo();
wxCUserBasicInfo.setId(basicInfo.getId());
wxCUserBasicInfo.setFinalTenantId(basicInfo.getFinalTenantId());
wxCUserBasicInfo.setNickName(nickName);
wxCUserBasicInfo.setSex(sex);
wxCUserBasicInfo.setAvatarUrl(avatarUrl);
wxCUserBasicInfoMapper.updateById(wxCUserBasicInfo);
}

return basicInfo;
@@ -687,6 +684,22 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
return record.getCreditAmount();
}

@Override
public void registerJinmao(TenantEntity tenantInfo ,WxCUserBasicInfo wxCUserBasicInfo) {
if (StringUtils.isNotBlank(wxCUserBasicInfo.getPhone())){
WxCUserBasicInfo basicInfo = this.findInfoByPhone(tenantInfo, wxCUserBasicInfo.getPhone());
if(basicInfo == null){
wxCUserBasicInfo.setTenantId("," + tenantInfo.getTenantId() + ",");
wxCUserBasicInfo.setFinalTenantId(tenantInfo.getFinalTenantId());
this.save(basicInfo);
}else{
wxCUserBasicInfo.setId(basicInfo.getId());
wxCUserBasicInfo.setFinalTenantId(tenantInfo.getFinalTenantId());
wxCUserBasicInfoMapper.updateById(basicInfo);
}
}
}


@Override
public WxCUserBasicInfo getById(Long id,String finalTenantId) {


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

@@ -14,11 +14,14 @@ import com.iformall.mapper.*;
import com.iformall.service.WxCUserTagsService;
import com.iformall.service.WxTagsService;
import com.iformall.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Pattern;
@@ -39,6 +42,9 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
@Autowired
WxCouponOrderMapper wxCouponOrderMapper;

@Autowired
JmSportOrderMapper jmSportOrderMapper;

@Autowired
WxCardSpendMapper wxCardSpendMapper;

@@ -694,6 +700,52 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
}
return resList;
}
private List<WxTags> assignTypeId30(WxCUserBasicInfo user, String h,String w) {
List<WxTags> resList = null;
//BMI=体重(kg)/(身高X身高)(㎡)
// ID_172(172L, EnumTagType.ID_30, "过轻"),//BMI<18.5 
// ID_173(173L, EnumTagType.ID_30, "标准"),//18.5<=BMI<24.9
// ID_174(174L, EnumTagType.ID_30, "过重"),//24.9<=BMI<30
// ID_175(175L, EnumTagType.ID_30, "肥胖"),//30<=BMI
double bmi = new BigDecimal(w)
.divide(new BigDecimal(h).divide(new BigDecimal(100)).pow(2))
.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
if(bmi < 18.5d){
resList = assign(user, EnumTag.ID_172);
}else if(bmi >= 18.5d && bmi < 24.9d){
resList = assign(user, EnumTag.ID_173);
}else if(bmi >= 24.9d && bmi <30d){
resList = assign(user, EnumTag.ID_174);
}else if(bmi >= 30d){
resList = assign(user, EnumTag.ID_175);
}
return resList;
}

private List<WxTags> assignTypeId31(WxCUserBasicInfo user,TenantEntity tenantEntity) {
List<WxTags> resList = null;
Calendar startC = Calendar.getInstance();
startC.setTime(new Date());
startC.add(Calendar.DAY_OF_YEAR, -30);

JmSportOrder jmSportOrder = new JmSportOrder();
jmSportOrder.setUserId(user.getId());
jmSportOrder.setStartDate(startC.getTime());
jmSportOrder.setEndDate(new Date());
jmSportOrder.updateTenantInfo(tenantEntity);

int count = jmSportOrderMapper.findCount(jmSportOrder);

float verifiedRate = (float)count/30;
if (verifiedRate > 1F/4)
resList = assign(user, EnumTag.ID_178);
else if (verifiedRate > 1F/7)
resList = assign(user, EnumTag.ID_177);
else if (verifiedRate > 1F/30)
resList = assign(user, EnumTag.ID_176);

return resList;
}

//打标接口
@Override
@@ -740,6 +792,9 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
//学历
resList = assignTypeId6(user, user.getEducation());
}
if (StringUtils.isNotBlank(user.getHeight()) && StringUtils.isNotBlank(user.getWeight())){
resList = assignTypeId30(user,user.getHeight(),user.getWeight());
}
resList = assignTypeId29(user);
}
}
@@ -834,6 +889,9 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
//学历
resList = assignTypeId6(user, user.getEducation());
}
if (StringUtils.isNotBlank(user.getHeight()) && StringUtils.isNotBlank(user.getWeight())){
resList = assignTypeId30(user,user.getHeight(),user.getWeight());
}

resList = assignTypeId29(user);
@@ -859,6 +917,40 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
}
}
break;
case ASSIGN_TAGS_TRIGGER_JINMAO_USER: {
WxCUserBasicInfo param = (WxCUserBasicInfo) obj;
WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getId(),param.getFinalTenantId());
if (user != null) {
if (user.getSex() != null) {
//性别
resList = assignTypeId1(user, user.getSex());
}
if (user.getBirthdate() != null) {
//X0后
resList = assignTypeId2(user, user.getBirthdate());
//生肖
resList = assignTypeId3(user, user.getBirthdate());
//星座
resList = assignTypeId4(user, user.getBirthdate());
}
if (user.getPhone() != null) {
//运营商
resList = assignTypeId7(user, user.getPhone());
}
if (StringUtils.isNotBlank(user.getHeight()) && StringUtils.isNotBlank(user.getWeight())){
resList = assignTypeId30(user,user.getHeight(),user.getWeight());
}
}
}
break;
case ASSIGN_TAGS_TRIGGER_JINMAO_ORDER: {
WxCUserBasicInfo param = (WxCUserBasicInfo) obj;
WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getId(),param.getFinalTenantId());
if (user != null) {
resList = assignTypeId31(user,tenantEntity);
}
}
break;
default:
return null;



+ 104
- 0
mallinkService/src/main/resources/mapper/JmSportOrderMapper.xml Просмотреть файл

@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.JmSportOrderMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.JmSportOrder">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="order_id" jdbcType="VARCHAR" property="orderId"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" />
<result column="user_phone" jdbcType="VARCHAR" property="userPhone"/>
<result column="user_id" jdbcType="BIGINT" property="userId"/>
<result column="product_name" jdbcType="VARCHAR" property="productName"/>
<result column="num" jdbcType="INTEGER" property="num"/>

<result column="price" jdbcType="VARCHAR" property="price"/>
<result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/>
<result column="pay_way" jdbcType="VARCHAR" property="payWay"/>

<result column="gym_name" jdbcType="VARCHAR" property="gymName"/>

<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
</resultMap>

<sql id="allColumns">
`id`,`order_id`,`tenant_id`,`parent_tenant_id`,`user_phone`,`user_id`,
`product_name`,`num`,`price`,`payment_time`,`pay_way`,
`gym_name`,
`create_date`,`update_date`
</sql>

<sql id="dynamicWhereConditions">
where 1 = 1

<if test=" null != id ">
and `id` = #{id}
</if>

<if test=" null != orderId and '' != orderId">
and `order_id` = #{orderId}
</if>

<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>

<if test=" null != userPhone and '' != userPhone">
and `user_phone` like concat('%', #{userPhone},'%')
</if>

<if test=" null != userId ">
and `user_id` = #{userId}
</if>

<if test=" null != productName and '' != productName">
and `product_name` like concat('%', #{productName},'%')
</if>

<if test="startDate != null">
and `payment_time` &gt;= #{startDate}
</if>
<if test="endDate != null">
and `payment_time` &lt;= #{endDate}
</if>

<if test=" null != payWay and '' != payWay">
and `pay_way` like concat('%', #{payWay},'%')
</if>

<if test=" null != ids ">
and `id` in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.JmSportOrder" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from jm_sport_order
<include refid="dynamicWhereConditions"/>
</select>

<select id="findCount" parameterType="com.iformall.domain.po.JmSportOrder" resultType="Integer">
select count(1)
from jm_sport_order
where 1 = 1
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>

<if test=" null != userId ">
and `user_id` = #{userId}
</if>
</select>

</mapper>

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

@@ -7,6 +7,9 @@
<result column="birthdate" jdbcType="TIMESTAMP" property="birthdate"/>
<result column="education" jdbcType="VARCHAR" property="education"/>
<result column="sex" jdbcType="INTEGER" property="sex"/>
<result column="height" jdbcType="VARCHAR" property="height"/>
<result column="weight" jdbcType="VARCHAR" property="weight"/>
<result column="id_card" jdbcType="VARCHAR" property="idCard"/>
<result column="email" jdbcType="VARCHAR" property="email"/>
<result column="address" jdbcType="VARCHAR" property="address"/>
<result column="poins" jdbcType="INTEGER" property="poins"/>
@@ -30,7 +33,7 @@
</resultMap>

<sql id="allColumns">
wcubi.`id`,wcubi.`phone`,wcubi.`birthdate`,wcubi.`education`,wcubi.`sex`,wcubi.`email`,
wcubi.`id`,wcubi.`phone`,wcubi.`birthdate`,wcubi.`education`,wcubi.`sex`,wcubi.`height`,wcubi.`weight`,wcubi.`id_card`,wcubi.`email`,
wcubi.`address`,wcubi.`poins`,wcubi.`tag_id`,wcubi.`create_date`,wcubi.`update_date`,
wcubi.`final_tenant_id`,wcubi.`tenant_id`,wcubi.`parent_tenant_id`,wcubi.`name`,wcubi.`nick_name`,
wcubi.`avatar_url`,wcubi.`credit`,wcubi.`active_time`,wcubi.`login_count`,wcubi.`act_record`,wcubi.`qr_code`
@@ -40,7 +43,7 @@
</sql>
<sql id="allSimpleColumns">
`id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`,
`id`,`phone`,`birthdate`,`education`,`sex`,`height`,`weight`,`id_card`,`email`,`address`,`poins`,`tag_id`,
`create_date`,`update_date`,`tenant_id`,`parent_tenant_id`,`name`,`nick_name`,`credit`,`active_time`,`act_record`
</sql>

@@ -425,7 +428,7 @@
</select>

<sql id="allColumnsOfScoreList">
cub.id,cub.phone,cub.birthdate,cub.education,cub.sex,cub.email,cub.address,cub.poins,cub.tag_id,
cub.id,cub.phone,cub.birthdate,cub.education,cub.sex,cub.`height`,cub.`weight`,cub.`id_card`,cub.email,cub.address,cub.poins,cub.tag_id,
cub.create_date,cub.update_date,cub.name,cub.level,cub.nick_name,cub.score_date,cub.final_tenant_id
</sql>

@@ -627,6 +630,9 @@
<result column="birthdate" jdbcType="TIMESTAMP" property="birthdate"/>
<result column="education" jdbcType="VARCHAR" property="education"/>
<result column="sex" jdbcType="INTEGER" property="sex"/>
<result column="height" jdbcType="VARCHAR" property="height"/>
<result column="weight" jdbcType="VARCHAR" property="weight"/>
<result column="id_card" jdbcType="VARCHAR" property="idCard"/>
<result column="email" jdbcType="VARCHAR" property="email"/>
<result column="address" jdbcType="VARCHAR" property="address"/>
<result column="poins" jdbcType="INTEGER" property="poins"/>
@@ -648,7 +654,7 @@
</resultMap>

<sql id="allVoColumns">
cu.`id`,cu.`phone`,cu.`birthdate`,cu.`education`,cu.`sex`,cu.`email`,cu.`address`,cu.`poins`,cu.`tag_id`,
cu.`id`,cu.`phone`,cu.`birthdate`,cu.`education`,cu.`sex`,cu.`height`,cu.`weight`,cu.`id_card`,cu.`email`,cu.`address`,cu.`poins`,cu.`tag_id`,
cu.`create_date`,cu.`update_date`,cu.`name`,cu.`level`,cu.`nick_name`,
cut.`tags`,
cu.`credit`,cu.`active_time`,cu.`act_record`,cu.`final_tenant_id`
@@ -829,7 +835,7 @@

<select id="findVoList1" resultMap="VoBaseResultMap">
select
cu.`id`,cu.`name`,cu.`sex`,cu.`phone`,cu.`nick_name`,cu.`education`,cu.`birthdate`,cu.`address`,
cu.`id`,cu.`name`,cu.`sex`,cu.`height`,cu.`weight`,cu.`id_card`,cu.`phone`,cu.`nick_name`,cu.`education`,cu.`birthdate`,cu.`address`,
cu.`active_time`,cu.`create_date`,cu.`poins`,cu.`credit`,
cut.`tags`
<!-- ,(select ifnull(sum(credit.credit_num),0) amount from wx_credit_history${basicInfo.shardFinalTableSuffix} credit-->


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