Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
5e856d796f
14 changed files with 104 additions and 8 deletions
  1. +37
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/CUser.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java
  6. +12
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java
  7. +11
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java
  8. +12
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java
  9. +11
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java
  10. +3
    -2
      mallinkService/src/main/resources/mapper/TtBuserMapper.xml
  11. +3
    -1
      mallinkService/src/main/resources/mapper/TtCUserMapper.xml
  12. +2
    -1
      mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml
  13. +3
    -2
      mallinkService/src/main/resources/mapper/WxBuserMapper.xml
  14. +2
    -1
      mallinkService/src/main/resources/mapper/WxCUserMapper.xml

+ 37
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java View File

@@ -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<String, String> 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\"}")


+ 1
- 0
mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java View File

@@ -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";
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/CUser.java View File

@@ -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)


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java View File

@@ -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){


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java View File

@@ -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);



+ 12
- 0
mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java View File

@@ -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) {


+ 11
- 0
mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java View File

@@ -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();


+ 12
- 0
mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java View File

@@ -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) {


+ 11
- 0
mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java View File

@@ -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();


+ 3
- 2
mallinkService/src/main/resources/mapper/TtBuserMapper.xml View File

@@ -49,7 +49,7 @@
<result column="active_time" jdbcType="TIMESTAMP" property="activeTime"/>
<result column="qr_code" jdbcType="VARCHAR" property="qrCode"/>
<result column="user_id" jdbcType="BIGINT" property="userId"/>
<result column="agree_protocol" jdbcType="INTEGER" property="agreeProtocol"/>
</resultMap>
<sql id="allColumns">
@@ -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`
</sql>
<sql id="dynamicWhereConditions">


+ 3
- 1
mallinkService/src/main/resources/mapper/TtCUserMapper.xml View File

@@ -49,6 +49,7 @@
<result column="credit" jdbcType="INTEGER" property="credit"/>
<result column="active_time" jdbcType="TIMESTAMP" property="activeTime"/>
<result column="qr_code" jdbcType="VARCHAR" property="qrCode"/>
<result column="agree_protocol" jdbcType="INTEGER" property="agreeProtocol"/>
</resultMap>

<sql id="allColumns">
@@ -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`
</sql>

<sql id="dynamicWhereConditions">


+ 2
- 1
mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml View File

@@ -25,13 +25,14 @@
<result column="business_license" jdbcType="VARCHAR" property="businessLicense"/>
<result column="icp" jdbcType="VARCHAR" property="icp"/>
<result column="laike_id" jdbcType="VARCHAR" property="laikeId"/>
<result column="company_name" jdbcType="VARCHAR" property="companyName"/>

</resultMap>

<sql id="allColumns">
`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`
</sql>

<sql id="dynamicWhereConditions">


+ 3
- 2
mallinkService/src/main/resources/mapper/WxBuserMapper.xml View File

@@ -49,7 +49,7 @@
<result column="active_time" jdbcType="TIMESTAMP" property="activeTime"/>
<result column="qr_code" jdbcType="VARCHAR" property="qrCode"/>
<result column="user_id" jdbcType="BIGINT" property="userId"/>
<result column="agree_protocol" jdbcType="INTEGER" property="agreeProtocol"/>
</resultMap>
<sql id="allColumns">
@@ -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`
</sql>
<sql id="dynamicWhereConditions">


+ 2
- 1
mallinkService/src/main/resources/mapper/WxCUserMapper.xml View File

@@ -52,6 +52,7 @@
<result column="authorize_state" jdbcType="INTEGER" property="authorizeState"/>
<result column="authorize_time" jdbcType="TIMESTAMP" property="authorizeTime"/>
<result column="deauthorize_time" jdbcType="TIMESTAMP" property="deauthorizeTime"/>
<result column="agree_protocol" jdbcType="INTEGER" property="agreeProtocol"/>
</resultMap>

<sql id="allColumns">
@@ -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`
</sql>

<sql id="dynamicWhereConditions">


Loading…
Cancel
Save