From 07120120a5a6f33c88e3b4376beb3db40680666a Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 20 Aug 2021 00:38:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...202108190001__add_wx_c_user_basic_info.sql | 399 ++++++++++++++++++ ...202108190002__add_wx_c_user_basic_info.sql | 299 +++++++++++++ .../db/migration/V202108190003__add_tag.sql | 12 + .../controller/callback/JinMaoController.java | 125 ++++-- .../com/iformall/domain/po/JmSportOrder.java | 52 +++ .../iformall/domain/po/WxCUserBasicInfo.java | 9 + .../iformall/enums/EnumAssignTagsTrigger.java | 2 + .../main/java/com/iformall/enums/EnumTag.java | 13 +- .../java/com/iformall/enums/EnumTagType.java | 7 + .../iformall/mapper/JmSportOrderMapper.java | 14 + .../iformall/service/JmSportOrderService.java | 21 + .../service/WxCUserBasicInfoService.java | 2 + .../service/impl/JmSportOrderServiceImpl.java | 48 +++ .../impl/WxCUserBasicInfoServiceImpl.java | 33 +- .../service/impl/WxCUserTagsServiceImpl.java | 92 ++++ .../resources/mapper/JmSportOrderMapper.xml | 104 +++++ .../mapper/WxCUserBasicInfoMapper.xml | 16 +- 17 files changed, 1206 insertions(+), 42 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V202108190001__add_wx_c_user_basic_info.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V202108190002__add_wx_c_user_basic_info.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V202108190003__add_tag.sql create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/JmSportOrder.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/JmSportOrderMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/service/JmSportOrderService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java create mode 100644 mallinkService/src/main/resources/mapper/JmSportOrderMapper.xml diff --git a/mallinkAdmin/src/main/resources/db/migration/V202108190001__add_wx_c_user_basic_info.sql b/mallinkAdmin/src/main/resources/db/migration/V202108190001__add_wx_c_user_basic_info.sql new file mode 100644 index 000000000..9c101bd6f --- /dev/null +++ b/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`; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V202108190002__add_wx_c_user_basic_info.sql b/mallinkAdmin/src/main/resources/db/migration/V202108190002__add_wx_c_user_basic_info.sql new file mode 100644 index 000000000..d3ddedc25 --- /dev/null +++ b/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`; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V202108190003__add_tag.sql b/mallinkAdmin/src/main/resources/db/migration/V202108190003__add_tag.sql new file mode 100644 index 000000000..018cff737 --- /dev/null +++ b/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, '运动频率'); diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java index 81b586025..b3ccf1080 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/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 map = new HashMap(); static { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTagType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTagType.java index 5e29be998..b1fcc1c00 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTagType.java +++ b/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, "会员等级"), diff --git a/mallinkService/src/main/java/com/iformall/mapper/JmSportOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/JmSportOrderMapper.java new file mode 100644 index 000000000..04158e600 --- /dev/null +++ b/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 { + + List findList(JmSportOrder record); + + Integer findCount(JmSportOrder record); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/JmSportOrderService.java b/mallinkService/src/main/java/com/iformall/service/JmSportOrderService.java new file mode 100644 index 000000000..bcf8c9485 --- /dev/null +++ b/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 listAsPage(JmSportOrder record, Integer pageIndex, Integer pageSize); + + void saveOrUpdate(JmSportOrder record); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index 5bcc4ab3c..6594442f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/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); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/JmSportOrderServiceImpl.java new file mode 100644 index 000000000..c800200e4 --- /dev/null +++ b/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 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); + } + } + + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index fd5fad0a6..f0d9d9f38 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/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) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 88872c557..4fae875be 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/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 assignTypeId30(WxCUserBasicInfo user, String h,String w) { + List 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 assignTypeId31(WxCUserBasicInfo user,TenantEntity tenantEntity) { + List 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; diff --git a/mallinkService/src/main/resources/mapper/JmSportOrderMapper.xml b/mallinkService/src/main/resources/mapper/JmSportOrderMapper.xml new file mode 100644 index 000000000..35ee25b88 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/JmSportOrderMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + `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` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `order_id` = #{orderId} + + + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + + and `user_phone` like concat('%', #{userPhone},'%') + + + + and `user_id` = #{userId} + + + + and `product_name` like concat('%', #{productName},'%') + + + + and `payment_time` >= #{startDate} + + + and `payment_time` <= #{endDate} + + + + and `pay_way` like concat('%', #{payWay},'%') + + + + and `id` in + + #{idItem} + + + order by ${sortColumns} + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 846dcea7e..75df9a432 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -7,6 +7,9 @@ + + + @@ -30,7 +33,7 @@ - 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 @@ - `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` @@ -425,7 +428,7 @@ - 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 @@ -627,6 +630,9 @@ + + + @@ -648,7 +654,7 @@ - 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 @@