seg_yinzy
/
ruoyi_vue_demo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

小程序后端个人中心返回信息中，增加用户注册地，推荐人信息

master
1020109007@qq.com 2021-10-16 23:27:27 +08:00
parent 630831b315
commit 69ac550fc0
15 changed files with 122 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultIndexController.java
View File

@ -141,7 +141,7 @@ public class SegchkDefaultIndexController extends BaseController
{
logger.debug("lableListByProviderAll with: {}", providerId);
startPage();
List<SegchkRecommenderStoreLableWeb> list = segchkStoreIndexService.selectSegchkRecommendLableList(providerId);
List<SegchkRecommenderStoreLableWeb> list = segchkStoreIndexService.selectSegchkLableList(providerId);
return getDataTable(list);
}

21
ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultUserController.java
View File

@ -679,15 +679,32 @@ public class SegchkDefaultUserController extends BaseController
segchkUserCharge.setProviderId(claims.getProviderId());
}
logger.debug("userChargeReq with: {}", segchkUserCharge.toString());
int ret_flag = 0;//未完成，1成功，2失败
AjaxResult ajax = new AjaxResult();
if(segchkUserCharge.getAccountUsed() != null && segchkUserCharge.getAccountUsed().compareTo(new BigDecimal(0.0)) == 1) {
// 用户选择使用余额买卡
BigDecimal user_account = segchkUserIndexService.getAccount(segchkUserCharge);
if(user_account == null || user_account.compareTo(segchkUserCharge.getAccountUsed()) == -1){
// 用户余额不足
ajax.put(CODE_TAG, "500");
ajax.put(MSG_TAG, "余额不足!");
return ajax;
}
if(user_account.compareTo(segchkUserCharge.getCharge()) > -1){
// 用户余额大于充值额度，用户可以直接使用
segchkUserCharge.setAccountUsed(segchkUserCharge.getCharge());
segchkUserCharge.setCharge(new BigDecimal(0.0));
ret_flag = 1;
logger.warn("userChargeReq useraccount({}) is big than charge({}) ", user_account, segchkUserCharge.getCharge());
}
else {
// 用户余额小于充值金额
segchkUserCharge.setAccountUsed(user_account);
segchkUserCharge.setCharge(segchkUserCharge.getCharge().subtract(user_account));
}
}
segchkUserCharge.setRetFlag(ret_flag);
int ret = segchkUserChargeService.insertSegchkUserCharge(segchkUserCharge);
if(ret < 1){
ajax.put(CODE_TAG, "500");
@ -727,7 +744,9 @@ public class SegchkDefaultUserController extends BaseController
return AjaxResult.error(500, "微信绑定失败!");
}
}
if(ret_flag == 1){
return AjaxResult.error(201, "充值成功");
}
CommonResponse<PrepayResult> prepayResultCommonResponse = segchkUserIndexService.wechatAppletPay(
segchkUserCharge.getChargeId().toString()
, segchkUserCharge.getUserId()

BIN
ruoyi-segchk-web/src/main/resources/templates/posters/bg.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 188 KiB

After

Width:  |  Height:  |  Size: 706 KiB

52
ruoyi-segchk/src/main/java/com/ruoyi/segchk/domain/SegchkUserWebResp.java
View File

@ -41,6 +41,22 @@ public class SegchkUserWebResp extends BaseEntity
@Excel(name = "微信唯一识别号")
private String openid;
/** 注册地区 */
@Excel(name = "注册地区")
private String districtName;
/** 推荐人id */
@Excel(name = "推荐人id")
private String recommenderId;
/** 推荐人角色 */
@Excel(name = "推荐人角色")
private String recommenderLevel;
/** 推荐人名称 */
@Excel(name = "推荐人名称")
private String recommenderName;
/** 用户头像 */
@Excel(name = "用户头像")
private String userIcon;
@ -230,6 +246,38 @@ public class SegchkUserWebResp extends BaseEntity
this.userLevel = userLevel;
}
public String getDistrictName() {
return districtName;
}
public void setDistrictName(String districtName) {
this.districtName = districtName;
}
public String getRecommenderId() {
return recommenderId;
}
public void setRecommenderId(String recommenderId) {
this.recommenderId = recommenderId;
}
public String getRecommenderLevel() {
return recommenderLevel;
}
public void setRecommenderLevel(String recommenderLevel) {
this.recommenderLevel = recommenderLevel;
}
public String getRecommenderName() {
return recommenderName;
}
public void setRecommenderName(String recommenderName) {
this.recommenderName = recommenderName;
}
@Override
public String toString() {
return "SegchkUserWebResp{" +
@ -239,6 +287,10 @@ public class SegchkUserWebResp extends BaseEntity
", phoneNo='" + phoneNo + '\'' +
", userName='" + userName + '\'' +
", openid='" + openid + '\'' +
", districtName='" + districtName + '\'' +
", recommenderId='" + recommenderId + '\'' +
", recommenderLevel='" + recommenderLevel + '\'' +
", recommenderName='" + recommenderName + '\'' +
", userIcon='" + userIcon + '\'' +
", iscertified=" + iscertified +
", account=" + account +

2
ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkProviderIndexMapper.java
View File

@ -61,4 +61,6 @@ public interface SegchkProviderIndexMapper
* @return 结果
*/
public String selectProviderOpenIdById(Long providerId);
public String selectSegchkProviderName(String providerId);
}

2
ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkStoreIndexMapper.java
View File

@ -142,4 +142,6 @@ public interface SegchkStoreIndexMapper {
public WeChatCustomerLink selectStoreOpenIdById(Long storeId);
public Integer isCollectByUser(Map<String, Object> params);
public String selectSegchkStoreName(String storeId);
}

2
ruoyi-segchk/src/main/java/com/ruoyi/segchk/mapper/SegchkUserIndexMapper.java
View File

@ -121,4 +121,6 @@ public interface SegchkUserIndexMapper {
int updateSegchkUserWechat(SegchkUserWechat segchkUserWechat);
WeChatCustomerLink getUserWechatOpenId(Long userId);
public String selectSegchkUserName(String userId);
}

2
ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkProviderIndexService.java
View File

@ -44,4 +44,6 @@ public interface ISegchkProviderIndexService
* @return 结果
*/
public String selectWeChatInfoByProviderId(Long userId);
public String selectSegchkProviderName(String recommenderId);
}

2
ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/ISegchkStoreIndexService.java
View File

@ -174,4 +174,6 @@ public interface ISegchkStoreIndexService
* @return 是否收藏，1已收藏，0未收藏
*/
Integer isCollectByUser(Long providerId, Long storeId, Long userId);
public String selectSegchkStoreName(String storeId);
}

5
ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/ISegchkStoreIndexServiceImpl.java
View File

@ -343,4 +343,9 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
params.put("userId", userId);
return segchkStoreIndexMapper.isCollectByUser(params);
}
@Override
public String selectSegchkStoreName(String storeId) {
return segchkStoreIndexMapper.selectSegchkStoreName(storeId);
}
}

5
ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkProviderIndexServiceImpl.java
View File

@ -70,4 +70,9 @@ public class SegchkProviderIndexServiceImpl implements ISegchkProviderIndexServi
public String selectWeChatInfoByProviderId(Long providerId) {
return segchkProviderIndexMapper.selectProviderOpenIdById(providerId);
}
@Override
public String selectSegchkProviderName(String providerId) {
return segchkProviderIndexMapper.selectSegchkProviderName(providerId);
}
}

9
ruoyi-segchk/src/main/java/com/ruoyi/segchk/service/impl/SegchkUserIndexServiceImpl.java
View File

@ -125,7 +125,14 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
@Override
public SegchkUserWebResp selectSegchkUserWebInfo(SegchkUserWebReq segchkUserWebReq) {
logger.debug("selectSegchkUserWebInfo with: {}", segchkUserWebReq.toString());
return segchkUserIndexMapper.selectSegchkUserWebInfo(segchkUserWebReq);
SegchkUserWebResp segchkUserWebResp = segchkUserIndexMapper.selectSegchkUserWebInfo(segchkUserWebReq);
switch (segchkUserWebResp.getRecommenderLevel()){
case "0": segchkUserWebResp.setRecommenderName(segchkProviderIndexService.selectSegchkProviderName(segchkUserWebResp.getRecommenderId()));break;
case "1": segchkUserWebResp.setRecommenderName(segchkStoreIndexService.selectSegchkStoreName(segchkUserWebResp.getRecommenderId()));break;
case "2": segchkUserWebResp.setRecommenderName(segchkUserIndexMapper.selectSegchkUserName(segchkUserWebResp.getRecommenderId()));break;
}
logger.debug("selectSegchkUserWebInfo res: ({})", segchkUserWebResp.toString());
return segchkUserWebResp;
}
/**

3
ruoyi-segchk/src/main/resources/mapper/segchk/SegchkProviderIndexMapper.xml
View File

@ -190,4 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectProviderOpenIdById" parameterType="long" resultType="string">
select openid from segchk_provider_mgt where provider_id = #{providerId}
</select>
<select id="selectSegchkProviderName" parameterType="string" resultType="java.lang.String">
select nick_name from segchk_provider_mgt where where provider_id = #{providerId}
</select>
</mapper>

3
ruoyi-segchk/src/main/resources/mapper/segchk/SegchkStoreIndexMapper.xml
View File

@ -730,4 +730,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and store_id = #{storeId}
and mgt_state = 0
</select>
<select id="selectSegchkStoreName" parameterType="string" resultType="java.lang.String">
select store_name from segchk_store_basic_info where store_id = #{storeId}
</select>
</mapper>

15
ruoyi-segchk/src/main/resources/mapper/segchk/SegchkUserIndexMapper.xml
View File

@ -10,6 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="phoneNo" column="phone_no"/>
<result property="userName" column="user_name"/>
<result property="openid" column="openid"/>
<result property="districtName" column="district_name"/>
<result property="recommenderId" column="recommender_id"/>
<result property="recommenderLevel" column="recommender_level"/>
<result property="userIcon" column="user_icon"/>
<result property="iscertified" column="iscertified"/>
<result property="account" column="account"/>
@ -178,6 +181,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
, case when isnull(wechat.nick_name) then basic.phone_no else wechat.nick_name end as user_name
, basic.phone_no
, wechat.openid
, sdi.district_name
, suei.user_recommenders as recommender_id
, suei.recommenders_level as recommender_level
, case when isnull(basic.user_icon) then wechat.icon_url else basic.user_icon end as user_icon
, case when isnull(certify.IDcard) then 0 else 1 end as iscertified
, case when isnull(account.account) then 0.0 else account.account end as account
@ -216,6 +222,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join
(select provider_id, user_id, count(1) as storecardcount from segchk_store_self_mgt where provider_id = #{providerId} and user_id = #{userId} and type_id = 2) storecard
on basic.user_id = storecard.user_id and basic.provider_id = storecard.provider_id;
left join
(select provider_id, District_id from segchk_provider_mgt where provider_id = #{providerId}) spm on basic.provider_id = spm.provider_id
left join
(select district_id, district_name from segchk_district_info) sdi on spm.District_id = sdi.district_id
left join
(select user_id, user_recommenders, recommenders_level, provider_id from segchk_user_ext_info where provider_id = #{providerId} and user_id = #{userId}) suei on suei.user_id = basic.user_id
</select>
<select id="selectUserServiceCHKList" parameterType="SegchkUserWebReq" resultMap="SegchkUserWebSCRespResult">
@ -587,6 +599,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select * from segchk_user_wechat where user_id = #{userId}
)b on a.user_id = b.user_id and a.provider_id = b.provider_id
</select>
<select id="selectSegchkUserName" parameterType="string" resultType="java.lang.String">
select phone_no from segchk_user_basic_info where user_id = #{userId}
</select>
<insert id="updateSegchkUserWechat" parameterType="SegchkUserWechat">
insert into segchk_user_wechat