diff --git a/mallinkAdmin/src/main/resources/db/migration/V202009211000__集团版数据处理.sql b/mallinkAdmin/src/main/resources/db/migration/V202009211000__集团版数据处理.sql index 2d51db685..367cd1911 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202009211000__集团版数据处理.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202009211000__集团版数据处理.sql @@ -22,6 +22,24 @@ call init_after_group(varchar tenantId,varchar subTenantIds); --UPDATE wx_c_user_tags SET tenant_id = groupTenantId WHERE FIND_IN_SET(tenant_id,tenantIds); +--活动报名表 wx_activity_join(如果新旧会员同时报名一个活动会导致数据重复) +--用户车牌表 wx_c_user_car 新旧会员都绑定了同一车牌的情况 + +create table wx_c_user_car_20201117_1008_1020 like wx_c_user_car; +create table wx_c_user_car_20201117_1008_1020_merge like wx_c_user_car; +insert into wx_c_user_car_20201117_1008_1020 select * from wx_c_user_car where tenant_id in (1008,1020); +insert into wx_c_user_car_20201117_1008_1020_merge select * from wx_c_user_car_20201117_1008_1020 where c_user_id in (select id from wx_c_user_basic_info_20201117_1008_1020_merge); +--shang 707 +select car_number from wx_c_user_car_20201117_1008_1020_merge GROUP BY car_number having count(car_number) > 1;--164 + +delete from wx_c_user_car_20201117_1008_1020_merge a where c_user_id in (select old_user_id from wx_c_user_basic_info_middle_20201117_1008_1020_merge) and car_number in (select car_number from wx_c_user_car_20201117_1008_1020_merge GROUP BY car_number having count(car_number) > 1); + +update wx_c_user_car_20201117_1008_1020_merge a LEFT JOIN wx_c_user_basic_info_middle_20201117_1008_1020_merge b on FIND_IN_SET(a.c_user_id,b.old_user_id) SET a.c_user_id = b.new_user_id WHERE b.new_user_id is not null; + +delete from wx_c_user_car where id in (select id from wx_c_user_car_20201117_1008_1020_merge); +insert into wx_c_user_car select * from wx_c_user_car_20201117_1008_1020_merge; + + diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/DdrivenCallbackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/DdrivenCallbackController.java new file mode 100644 index 000000000..8ca4357d0 --- /dev/null +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/DdrivenCallbackController.java @@ -0,0 +1,25 @@ +package com.iformall.controller.callback; + +import com.iformall.controller.base.BaseController; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@RestController +@RequestMapping("ddrivenCallback") +public class DdrivenCallbackController extends BaseController { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + + @PostMapping(value = "/push") + public void receivemsg(@RequestParam Map param) { + logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::receivemsg"); + logger.info(param.toString()); + //解析param数据插入数据库中 + + } + +}