From 5e856d796fa84f108bedcfcdc02fa7b52288c1fb Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Thu, 12 Dec 2024 11:31:54 +0800 Subject: [PATCH] fix --- .../controller/WxUserGrantController.java | 38 ++++++++++++++++++- .../iformall/common/SysConfigConstant.java | 1 + .../java/com/iformall/domain/po/CUser.java | 3 ++ .../com/iformall/domain/po/WxAppinfo.java | 2 + .../service/cuser/CUserServiceApapter.java | 2 + .../cuser/tt/TtBUserServiceAdapter.java | 12 ++++++ .../cuser/tt/TtCUserServiceAdapter.java | 11 ++++++ .../cuser/wx/WxBUserServiceAdapter.java | 12 ++++++ .../cuser/wx/WxCUserServiceAdapter.java | 11 ++++++ .../main/resources/mapper/TtBuserMapper.xml | 5 ++- .../main/resources/mapper/TtCUserMapper.xml | 4 +- .../main/resources/mapper/WxAppinfoMapper.xml | 3 +- .../main/resources/mapper/WxBuserMapper.xml | 5 ++- .../main/resources/mapper/WxCUserMapper.xml | 3 +- 14 files changed, 104 insertions(+), 8 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index fda0ad74c..3524e0993 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -19,6 +19,7 @@ import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumCUserFrom; import com.iformall.enums.EnumEnableType; import com.iformall.enums.EnumLevelConfigDiscountStatus; +import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.service.cuser.CUserServiceFactory; @@ -273,7 +274,7 @@ public class WxUserGrantController extends BaseController { } //处理登陆用户 cUser = cuserFactory.getCUserService(appPlat).handleLoginUser(cUser,wxCUserFrom); - + resultMap.put("agreeProtocol", cUser.getAgreeProtocol()); resultMap.put("token", cUser.getToken()); // request.setAttribute(Constant.LOGIN_USER_KEY, cUser.getId()); @@ -306,6 +307,41 @@ public class WxUserGrantController extends BaseController { // // return new ResultData(); // } + + @ApiOperation("是否需要强制弹协议窗口") + @GetMapping("/needAgreeProtocol") + public ResultData needAgreeProtocol() { + SysConfig config = sysConfigService.getByKey(SysConfigConstant.need_agree_protocol, getCUser()); + if (null == config || null == config.getConfigItemValue() || "0".equals(config.getConfigItemValue())) { + return new ResultData(0); + }else { + return new ResultData(1); + } + } + + @ApiOperation("appInfo") + @GetMapping("/appInfoDetail") + public ResultData appInfoDetail(String appId) { + WxAppinfo wxAppinfo = wxAppinfoService.getOnlyByAppIdFromRedis(appId); + if(wxAppinfo == null){ + return new ResultData(ErrorCode.APP_ID_NOT_FOUND); + } + return new ResultData(wxAppinfo); + } + + @PostMapping("/agreementProtocol") + @ApiOperation(value = "同意协议scene", notes = "{}") + public ResultData agreementProtocol(@RequestBody Map map) { + //logger.info(map.toString()); + //String scene = map.get("openId"); + CUser user = getCUser(); + if (null == user.getAgreeProtocol() || + user.getAgreeProtocol().intValue() == EnumYesOrNo.NO.getCode().intValue()) { + cuserFactory.getCUserService(user.getAppPlat()).agreeProtocol(user); + removeCacheCUser(); + } + return new ResultData(); + } @PostMapping("/updateScene") @ApiOperation(value = "用户更新scene", notes = "{\"scene\":\"string\"}") diff --git a/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java b/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java index 533684207..5732c6261 100644 --- a/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java +++ b/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java @@ -13,4 +13,5 @@ public class SysConfigConstant { public static final String bill_before_days = "billBeforeDays"; public static final String bill_near_days = "billNearDays"; public static final String rent_share_bill_rate = "rentsharebillrate"; + public static final String need_agree_protocol = "needagreeprotocol"; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/CUser.java b/mallinkService/src/main/java/com/iformall/domain/po/CUser.java index c4ac34cc6..2551775f7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/CUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/CUser.java @@ -109,6 +109,9 @@ public class CUser extends BaseCUserEntity { @io.swagger.annotations.ApiModelProperty(value="微信二维码",name="qrCode") private String qrCode; + + @io.swagger.annotations.ApiModelProperty(value="是否同意隐私协议EnumYesOrNo",name="agreeProtocol") + private Integer agreeProtocol; public String getWeappPath() { if(userId == null) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index d9bc796e5..d0dc286fd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -53,6 +53,8 @@ public class WxAppinfo extends BaseTenantEntity { private String icp; @io.swagger.annotations.ApiModelProperty(value="抖音来客ID",name="laikeId") private String laikeId; + @io.swagger.annotations.ApiModelProperty(value="抖音来客ID",name="companyName") + private String companyName; public WxAppinfo(){} public WxAppinfo(Integer mouldType){ diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java index 136d81520..a6a614462 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java @@ -33,6 +33,8 @@ public interface CUserServiceApapter { CUser getById(Long id, String tenantId); CUser getByOpenId(String openId, String tenantId); + + void agreeProtocol(CUser user); void updateScene(CUser user); diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java index d56ba4127..6de004174 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java @@ -15,6 +15,7 @@ import com.iformall.domain.vo.UserCountVo; import com.iformall.domain.vo.UserStructureVo; import com.iformall.douyin.miniapp.api.TtMaService; import com.iformall.enums.EnumAppPlat; +import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.mapper.TtBuserMapper; import com.iformall.service.WxAppinfoService; @@ -210,6 +211,17 @@ public class TtBUserServiceAdapter extends BasicCUserService implements CUserSer buser.setOpenId(openId); return ttBuserMapper.findByOpenId(buser); } + + @Override + public void agreeProtocol(CUser user) { + TtBuser userL = new TtBuser(); + userL.updateTenantInfo(user); + userL.setId(user.getId()); + userL.setAgreeProtocol(EnumYesOrNo.YES.getCode()); + userL.setUpdateDate(new Date()); + ttBuserMapper.updateById(userL); + cleanCuserToken(user.getToken()); + } @Override public void updateScene(CUser user) { diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java index dc5575a43..645422cd1 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java @@ -270,6 +270,17 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer return ttCUserMapper.findByOpenId(cUser); } + @Override + public void agreeProtocol(CUser user) { + TtCUser userL = new TtCUser(); + userL.updateTenantInfo(user); + userL.setId(user.getId()); + userL.setAgreeProtocol(EnumYesOrNo.YES.getCode()); + userL.setUpdateDate(new Date()); + ttCUserMapper.updateById(userL); + cleanCuserToken(user.getToken()); + } + @Override public void updateScene(CUser user) { TtCUser userL = new TtCUser(); diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java index ff1b8e785..7a5147878 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java @@ -15,6 +15,7 @@ import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.domain.vo.UserCountVo; import com.iformall.domain.vo.UserStructureVo; import com.iformall.enums.EnumAppPlat; +import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxBuserMapper; @@ -216,6 +217,17 @@ public class WxBUserServiceAdapter extends BasicCUserService implements CUserSer buser.setOpenId(openId); return wxBuserMapper.findByOpenId(buser); } + + @Override + public void agreeProtocol(CUser user) { + WxBuser userL = new WxBuser(); + userL.updateTenantInfo(user); + userL.setId(user.getId()); + userL.setAgreeProtocol(EnumYesOrNo.YES.getCode()); + userL.setUpdateDate(new Date()); + wxBuserMapper.updateById(userL); + cleanCuserToken(user.getToken()); + } @Override public void updateScene(CUser user) { diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java index 3132392e2..bae8b4630 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java @@ -278,6 +278,17 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer return wxCUserMapper.findByOpenId(wxCUser); } + @Override + public void agreeProtocol(CUser user) { + WxCUser userL = new WxCUser(); + userL.updateTenantInfo(user); + userL.setId(user.getId()); + userL.setAgreeProtocol(EnumYesOrNo.YES.getCode()); + userL.setUpdateDate(new Date()); + wxCUserMapper.updateById(userL); + cleanCuserToken(user.getToken()); + } + @Override public void updateScene(CUser user) { WxCUser userL = new WxCUser(); diff --git a/mallinkService/src/main/resources/mapper/TtBuserMapper.xml b/mallinkService/src/main/resources/mapper/TtBuserMapper.xml index 67589fdc6..c65db97c9 100644 --- a/mallinkService/src/main/resources/mapper/TtBuserMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtBuserMapper.xml @@ -49,7 +49,7 @@ - + @@ -59,7 +59,8 @@ `update_date`,`create_date`,`app_id`,`token`,`expire_time`,`latitude`, `longitude`, `locate_city`, `login_count`, `extra_info`, `is_subscribe`,`open_app_id`,`user_id`, `mp_open_id`,`mp_app_id`,`mp_subscribe`,`mp_subscribe_time`,`mp_subscribe_scene`, - `subs_open_id`,`subs_app_id`,`subs_subscribe`,`subs_subscribe_time`,`subs_subscribe_scene`,`credit`,`active_time`,`qr_code` + `subs_open_id`,`subs_app_id`,`subs_subscribe`,`subs_subscribe_time`,`subs_subscribe_scene`,`credit`, + `active_time`,`qr_code`,`agree_protocol` diff --git a/mallinkService/src/main/resources/mapper/TtCUserMapper.xml b/mallinkService/src/main/resources/mapper/TtCUserMapper.xml index 42e250310..358d6f924 100644 --- a/mallinkService/src/main/resources/mapper/TtCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtCUserMapper.xml @@ -49,6 +49,7 @@ + @@ -59,7 +60,8 @@ `login_count`, `extra_info`, `is_subscribe`, `open_app_id`, `mp_open_id`,`mp_app_id`,`mp_subscribe`,`mp_subscribe_time`,`mp_subscribe_scene`, - `subs_open_id`,`subs_app_id`,`subs_subscribe`,`subs_subscribe_time`,`subs_subscribe_scene`,`credit`,`active_time`,`qr_code` + `subs_open_id`,`subs_app_id`,`subs_subscribe`,`subs_subscribe_time`,`subs_subscribe_scene`,`credit`, + `active_time`,`qr_code`,`agree_protocol` diff --git a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml index e89c51a5a..90f5eaa35 100644 --- a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml @@ -25,13 +25,14 @@ + `id`,`tenant_id`,`app_id`,`parent_app_id`,`name`, `secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`, - `pay_id`,`type`,`mould_type`,`enable`,`plat`,`sort_url`,`business_license`,`icp`,`laike_id` + `pay_id`,`type`,`mould_type`,`enable`,`plat`,`sort_url`,`business_license`,`icp`,`laike_id`,`company_name` diff --git a/mallinkService/src/main/resources/mapper/WxBuserMapper.xml b/mallinkService/src/main/resources/mapper/WxBuserMapper.xml index 944729b41..5237036f2 100644 --- a/mallinkService/src/main/resources/mapper/WxBuserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBuserMapper.xml @@ -49,7 +49,7 @@ - + @@ -59,7 +59,8 @@ `update_date`,`create_date`,`app_id`,`token`,`expire_time`,`latitude`, `longitude`, `locate_city`, `login_count`, `extra_info`, `is_subscribe`,`open_app_id`,`user_id`, `mp_open_id`,`mp_app_id`,`mp_subscribe`,`mp_subscribe_time`,`mp_subscribe_scene`, - `subs_open_id`,`subs_app_id`,`subs_subscribe`,`subs_subscribe_time`,`subs_subscribe_scene`,`credit`,`active_time`,`qr_code` + `subs_open_id`,`subs_app_id`,`subs_subscribe`,`subs_subscribe_time`,`subs_subscribe_scene`,`credit`, + `active_time`,`qr_code`,`agree_protocol` diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 6ab1c1b5c..a6ca4101a 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -52,6 +52,7 @@ + @@ -63,7 +64,7 @@ `open_app_id`, `mp_open_id`,`mp_app_id`,`mp_subscribe`,`mp_subscribe_time`,`mp_subscribe_scene`, `subs_open_id`,`subs_app_id`,`subs_subscribe`,`subs_subscribe_time`,`subs_subscribe_scene`,`credit`,`active_time`,`qr_code`, - `authorize_state`,`authorize_time`, `deauthorize_time` + `authorize_state`,`authorize_time`, `deauthorize_time`,`agree_protocol`