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

在每个controller增加调试信息

master
1020109007@qq.com 2021-10-01 09:59:26 +08:00
parent cfae0404fc
commit e9ec13475e
39 changed files with 917 additions and 728 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -316,7 +316,10 @@
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
<meminitial>512m</meminitial>
<maxmem>1048m</maxmem>
</configuration>
</plugin>
</plugins>
</build>

2
ruoyi-admin/pom.xml
View File

@ -6,7 +6,7 @@
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.6.0</version>
<relativePath>../pom.xml</relativePath>
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-common/pom.xml
View File

@ -6,7 +6,7 @@
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.6.0</version>
<relativePath>../pom.xml</relativePath>
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-framework/pom.xml
View File

@ -6,7 +6,7 @@
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.6.0</version>
<relativePath>../pom.xml</relativePath>
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-generator/pom.xml
View File

@ -6,7 +6,7 @@
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.6.0</version>
<relativePath>../pom.xml</relativePath>
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-quartz/pom.xml
View File

@ -6,7 +6,7 @@
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.6.0</version>
<relativePath>../pom.xml</relativePath>
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-segchk-web/pom.xml
View File

@ -6,7 +6,7 @@
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.6.0</version>
<relativePath>../pom.xml</relativePath>
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

46
ruoyi-segchk-web/src/main/java/com/ruoyi/login/SegChkLoginController.java
View File

@ -70,6 +70,7 @@ public class SegChkLoginController {
/**
* 注入登录处理service
*/
@ -132,12 +133,15 @@ public class SegChkLoginController {
}
Claims claims = getClaims(getToken(request));
SegchkUserWebReq segchkUserWebReq1 = new SegchkUserWebReq();
segchkUserWebReq1.setUserId(claims.getUserId());
segchkUserWebReq1.setProviderId(claims.getProviderId());
segchkUserWebReq1.setUserLevel(claims.getUserLevel());
SegchkUserWebReq segchkUserWebReq1 = new SegchkUserWebReq();
segchkUserWebReq1.setUserId(claims.getUserId());
segchkUserWebReq1.setProviderId(claims.getProviderId());
segchkUserWebReq1.setUserLevel(claims.getUserLevel());
return loginService.login(segchkUserWebReq1);
AjaxResult login = loginService.login(segchkUserWebReq1);
login.put("token", getToken(request));
return login;
}
/**
@ -160,7 +164,36 @@ public class SegChkLoginController {
public AjaxResult sendSmsCode(String mobile) {
// 发送短信验证码
logger.debug("sendmobilecode ---> phone:{}", mobile);
int ret = registerService.sendRegisterSmsCode(mobile, code -> redisService.setCacheObject(String.format("%s_%s", CommonConstant.APPLET_REGISTER_CODE_KEY, mobile), code, 5, TimeUnit.MINUTES));
int ret = registerService.sendRegisterSmsCodeFortest(mobile, code -> redisService.setCacheObject(String.format("%s_%s", CommonConstant.APPLET_REGISTER_CODE_KEY, mobile), code, 5, TimeUnit.MINUTES));
if(ret != 0 ){
return AjaxResult.error("500", "验证码发送失败，请稍后重试");
}
return AjaxResult.success("验证码发送成功");
}
/**
* 发送短信验证码测试
* r
*
* @param mobile 手机号码
* @return 0 成功 1 失败 -1 手机号码已经存在
*/
@UnAuth
@RequestMapping(value = "/sendmobilecodetest")
@ResponseBody
@ApiOperation(value = "发送短信验证码", notes = "发送短信验证码（不需要认证）", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "form", dataType = "string", name = "mobile", value = "手机号码"),
})
@ApiResponses({
@ApiResponse(code = 200, message = "0 成功 1 失败 -1 手机号码已经存在", response = Integer.class)
})
public AjaxResult sendmobilecodetest(String mobile) {
// 发送短信验证码
logger.debug("sendmobilecode ---> phone:{}", mobile);
int ret = registerService.sendRegisterSmsCodeFortest(mobile, code -> redisService.setCacheObject(String.format("%s_%s", CommonConstant.SMS_TEST_KEY, mobile), code, 5, TimeUnit.MINUTES));
if(ret != 0 ){
return AjaxResult.error("500", "验证码发送失败，请稍后重试");
@ -204,6 +237,7 @@ public class SegChkLoginController {
@ApiImplicitParam(paramType = "form", dataType = "string", name = "code", value = "用户登录凭证"),
})
public AjaxResult bindaccount(@RequestBody BindParams bindParams , HttpServletRequest request) {
logger.debug("bindaccount with: {}", bindParams.toString());
WechatPaySet wechatAppletPaySet = paySetService.queryPaySet().getWechatAppletPaySet();
WechatSetting wechatSetting = new WechatSetting();
if(!StringUtils.isEmpty(bindParams.getRemark())){

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

@ -1,17 +1,27 @@
package com.ruoyi.segchk;
import com.ruoyi.appletsutil.ResultCode;
import com.ruoyi.appletsutil.UnAuthorizedException;
import com.ruoyi.common.annotation.UnAuth;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.segchk.domain.*;
import com.ruoyi.segchk.service.ISegchkStoreIndexService;
import com.ruoyi.segchk.service.impl.ISegchkStoreIndexServiceImpl;
import com.ruoyi.util.Claims;
import io.swagger.annotations.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Objects;
import static com.ruoyi.common.core.domain.AjaxResult.CODE_TAG;
import static com.ruoyi.common.core.domain.AjaxResult.DATA_TAG;
@ -27,9 +37,16 @@ import static com.ruoyi.common.core.domain.AjaxResult.DATA_TAG;
@Api("商城开放接口")
public class SegchkDefaultIndexController extends BaseController
{
private static final Logger logger = LoggerFactory.getLogger(SegchkDefaultIndexController.class);
@Autowired
private ISegchkStoreIndexService segchkStoreIndexService;
/**
* 注入redis服务
*/
@Autowired
private RedisCache redisService;
/**
* 根据用户当前所在地市行政id，返回运营商id 尹志颖
* {
@ -47,6 +64,7 @@ public class SegchkDefaultIndexController extends BaseController
})
public AjaxResult get_provider_byadcode(Long adcode)
{
logger.debug("get_provider_byadcode with: {}", adcode);
AjaxResult ajax = new AjaxResult();
Long providerId = segchkStoreIndexService.getProvider(adcode);
ajax.put(CODE_TAG, 200);
@ -76,6 +94,7 @@ public class SegchkDefaultIndexController extends BaseController
@ApiOperation(value = "搜索商户", notes = "搜索商户（不需要认证）", httpMethod = "POST")
public TableDataInfo store_search(@RequestBody SegchkStoreWebReq segchkStoreWebReq)
{
logger.debug("store_search with: {}", segchkStoreWebReq.toString());
startPage();
List<SegchkStoreIndexWebResp> list = segchkStoreIndexService.selectSegchkStoreSearch(segchkStoreWebReq);
return getDataTable(list);
@ -92,6 +111,7 @@ public class SegchkDefaultIndexController extends BaseController
@ResponseBody
public TableDataInfo lable_list_by_provider(Long providerId)
{
logger.debug("lable_list_by_provider with: {}", providerId);
startPage();
List<SegchkRecommenderStoreLableWeb> list = segchkStoreIndexService.selectSegchkStoreLableList(providerId);
return getDataTable(list);
@ -112,6 +132,7 @@ public class SegchkDefaultIndexController extends BaseController
@ApiOperation(value = "根据运营商id查询seg首页推荐商户列表", notes = "不需要鉴权")
public TableDataInfo list_by_provider(@RequestBody SegchkRecommenderStoreWebReq segchkRecommenderStoreWebReq)
{
logger.debug("list_by_provider with: {}", segchkRecommenderStoreWebReq.toString());
startPage();
List<SegchkRecommenderStoreWebResp> list = segchkStoreIndexService.selectSegchkRecommenderStoreListByProvider(segchkRecommenderStoreWebReq);
System.out.println(list.size());
@ -126,6 +147,7 @@ public class SegchkDefaultIndexController extends BaseController
* "sortType": 0,
* "lableId": 1,
* "typeId": 2,
* "cardId": 2, 可选项，当用户在商户列表中，点选某个具体会员卡时才有效
* "userLon": 116.25849,
* "userLat": 39.684333
* }
@ -136,6 +158,7 @@ public class SegchkDefaultIndexController extends BaseController
@ApiOperation(value = "根据标签id，搜索商户列表", notes = "不需要鉴权")
public TableDataInfo list_by_providerwith_lable(@RequestBody SegchkStoreWebReq segchkStoreWebReq)
{
logger.debug("list_by_providerwith_lable with: {}", segchkStoreWebReq.toString());
startPage();
List<SegchkStoreIndexWebResp> list = segchkStoreIndexService.selectSegchkStoreList(segchkStoreWebReq);
return getDataTable(list);
@ -153,6 +176,7 @@ public class SegchkDefaultIndexController extends BaseController
@ApiOperation(value = "根据运营商id,返回轮播图列表", notes = "不需要鉴权")
public TableDataInfo get_banners_by_provider(Long providerId)
{
logger.debug("get_banners_by_provider with: {}", providerId);
// AjaxResult ajax = new AjaxResult();
startPage();
List<SegchkCarouseMgt> segchkCarouseMgtList = segchkStoreIndexService.getBanners(providerId);
@ -174,18 +198,31 @@ public class SegchkDefaultIndexController extends BaseController
@PostMapping("/storeDetails")
@ResponseBody
@ApiOperation(value = "根据运营商，商户id，查询商户详情", notes = "不需要鉴权")
public AjaxResult store_details(@RequestBody SegchkStoreWebReq segchkStoreWebReq, String recommenderId, String recommenderLevel)
public AjaxResult store_details(@RequestBody SegchkStoreWebReq segchkStoreWebReq, String recommenderId, String recommenderLevel, HttpServletRequest request)
{
logger.debug("store_details with: {}---{}---{}", segchkStoreWebReq.toString(), recommenderId, recommenderLevel);
// startPage();
SegchkStoreBasicInfoWebResp segchkStoreBasicInfoWebResp = segchkStoreIndexService.selectSegchkStoreDetails(segchkStoreWebReq);
try {
Claims claims = getClaims(getToken(request));
if (!ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
// userId = getClaims(getToken(request)).getUserId();
segchkStoreBasicInfoWebResp.setIsCollect(segchkStoreIndexService.isCollectByUser(segchkStoreWebReq.getProviderId(), segchkStoreWebReq.getStoreId(), getClaims(getToken(request)).getUserId()));
}
}catch (Exception e){
logger.error("storeDetails without user");
}
AjaxResult ajax = AjaxResult.success("获取成功", segchkStoreBasicInfoWebResp);
if(!StringUtils.isEmpty(recommenderId) && !StringUtils.isEmpty(recommenderLevel)){
logger.debug("store_details recommender with: {}---{}", recommenderId, recommenderLevel);
int ret = segchkStoreIndexService.recommenderIsExit(recommenderId, recommenderLevel, segchkStoreWebReq.getProviderId().toString());
if(ret == 1){
ajax.put("recommenderId", recommenderId);
ajax.put("recommenderLevel", recommenderLevel);
}
logger.warn("the recommender: {}{} is {}", recommenderId, recommenderLevel, ret < 1 ? "not exit" : "exit");
logger.warn("store_details the recommender: {}{} is {}", recommenderId, recommenderLevel, ret < 1 ? "not exit" : "exit");
}
return ajax;
}
@ -199,10 +236,42 @@ public class SegchkDefaultIndexController extends BaseController
@ApiOperation(value = "查询seg商户评价列表", notes = "不需要鉴权")
public TableDataInfo store_comment_list(@RequestBody SegchkStoreWebReq segchkStoreWebReq)
{
logger.debug("store_comment_list with: {}", segchkStoreWebReq.toString());
startPage();
List<SegchkServiceCommentWebResp> segchkServiceCommentWebRespList = segchkStoreIndexService.selectSegchkStoreComments(segchkStoreWebReq);
return getDataTable(segchkServiceCommentWebRespList);
}
/**
* 获取小程序凭证实体
*
* @param token token
* @return 小程序凭证实体
*/
private Claims getClaims(String token) {
Object claims = redisService.getCacheObject(token);
logger.debug("getClaims---token:{} Claims:{}", token, claims);
return ObjectUtils.isEmpty(claims) ? null : (Claims) claims;
}
/**
* 获取token
*
* @param request request
* @return token
*/
private String getToken(HttpServletRequest request) {
// 认证信息在header 中的key
final String authHeader = request.getHeader("Authorization");
if (Objects.isNull(authHeader) || !authHeader.startsWith("Bearer")) {
logger.info("getClaims fail :Authorization fail ");
throw new UnAuthorizedException(ResultCode.WX_NOT_AUTHORIZED);
}
return authHeader.length() >= 7 ? authHeader.substring(7) : authHeader.substring(6);
}
}

78
ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultProviderController.java
View File

@ -12,6 +12,8 @@ import com.ruoyi.segchk.service.*;
import com.ruoyi.util.Claims;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
@ -43,6 +45,7 @@ public class SegchkDefaultProviderController extends BaseController
@Autowired
private RedisCache redisService;
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
/**
* 查询seg用户中心信息 尹志颖
* {
@ -86,36 +89,28 @@ public class SegchkDefaultProviderController extends BaseController
@ApiOperation(value = "根据运营商id，角色等级，返回运营商下所有核消统计或售卡统计", notes = "需要鉴权")
public TableDataInfo providerServiceAndSaleList(@RequestBody SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq, HttpServletRequest request)
{
Long userId = -1L;
Claims claims = null;
try {
claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
if(StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
Claims claims = null;
try {
claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = claims.getUserId();
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
}
catch (Exception e){
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkServiceAndSaleWebReq.setProviderId(claims.getUserId());
}
catch (Exception e){
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(!StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
segchkServiceAndSaleWebReq.setStaticMonth(segchkServiceAndSaleWebReq.getRemark());
}
else if(!segchkServiceAndSaleWebReq.getProviderId().equals(claims.getUserId())){
// segchkServiceAndSaleWebReq.setProviderId(claims.getUserId());
logger.warn("providerServiceAndSaleList --- from provider: {} with toke: {}", segchkServiceAndSaleWebReq.getProviderId(), claims);
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(301);
tableDataInfo.setMsg("用户信息异常");
return tableDataInfo;
}
logger.debug("providerServiceAndSaleList with: {}", segchkServiceAndSaleWebReq.toString());
startPage();
List<SegchkServiceAndSaleWebResp> segchkServiceAndSaleWebRespList = segchkProviderIndexService.selectProviderServiceAndSaleList(segchkServiceAndSaleWebReq);
return getDataTable(segchkServiceAndSaleWebRespList);
@ -135,35 +130,28 @@ public class SegchkDefaultProviderController extends BaseController
@ApiOperation(value = "根据运营商id，角色等级，返回运营商下核消统计或售卡统计", notes = "需要鉴权")
public TableDataInfo providerServiceAndSaleDetails(@RequestBody SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq, HttpServletRequest request)
{
Long userId = -1L;
Claims claims = null;
try {
claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
if(StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
Claims claims = null;
try {
claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
}
catch (Exception e){
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkServiceAndSaleWebReq.setProviderId(claims.getUserId());
}
catch (Exception e){
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(!StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
segchkServiceAndSaleWebReq.setStaticMonth(segchkServiceAndSaleWebReq.getRemark());
}
else if(!segchkServiceAndSaleWebReq.getProviderId().equals(claims.getUserId())){
// segchkServiceAndSaleWebReq.setProviderId(claims.getUserId());
logger.warn("providerServiceAndSaleList --- from provider: {} with toke: {}", segchkServiceAndSaleWebReq.getProviderId(), claims);
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(301);
tableDataInfo.setMsg("用户信息异常");
return tableDataInfo;
}
logger.warn("providerServiceAndSaleDetails with: {}", segchkServiceAndSaleWebReq.toString());
startPage();
List<SegchkServiceAndSaleDetailWebResp> segchkServiceAndSaleDetailWebRespList = segchkProviderIndexService.selectProviderServiceAndSaleDetails(segchkServiceAndSaleWebReq);
return getDataTable(segchkServiceAndSaleDetailWebRespList);

91
ruoyi-segchk-web/src/main/java/com/ruoyi/segchk/SegchkDefaultStoreController.java
View File

@ -13,6 +13,8 @@ import com.ruoyi.segchk.service.*;
import com.ruoyi.util.Claims;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@ -46,7 +48,7 @@ public class SegchkDefaultStoreController extends BaseController
@Autowired
private ISegchkProviderIndexService segchkProviderIndexService;
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
/**
* 注入redis服务
*/
@ -99,18 +101,20 @@ public class SegchkDefaultStoreController extends BaseController
@ApiOperation(value = "根据商家id，运营商id，角色等级，返回核消统计或售卡统计", notes = "需要鉴权")
public TableDataInfo store_service_and_sale_list(@RequestBody SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq, HttpServletRequest request)
{
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkServiceAndSaleWebReq.setStoreId(claims.getUserId());
segchkServiceAndSaleWebReq.setProviderId(claims.getProviderId());
}
logger.debug("store_service_and_sale_list with: {}", segchkServiceAndSaleWebReq.toString());
startPage();
List<SegchkServiceAndSaleWebResp> segchkServiceAndSaleWebRespList = segchkStoreIndexService.selectStoreServiceAndSaleList(segchkServiceAndSaleWebReq);
return getDataTable(segchkServiceAndSaleWebRespList);
@ -131,18 +135,20 @@ public class SegchkDefaultStoreController extends BaseController
@ApiOperation(value = "根据商家id，运营商id，角色等级，返回核消统计或售卡统计", notes = "需要鉴权")
public TableDataInfo store_service_and_sale_details(@RequestBody SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq, HttpServletRequest request)
{
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkServiceAndSaleWebReq.setStoreId(claims.getUserId());
segchkServiceAndSaleWebReq.setProviderId(claims.getProviderId());
}
logger.debug("store_service_and_sale_details with: {}", segchkServiceAndSaleWebReq.toString());
startPage();
List<SegchkServiceAndSaleDetailWebResp> segchkServiceAndSaleDetailWebRespList = segchkStoreIndexService.selectStoreServiceAndSaleDetails(segchkServiceAndSaleWebReq);
return getDataTable(segchkServiceAndSaleDetailWebRespList);
@ -163,18 +169,20 @@ public class SegchkDefaultStoreController extends BaseController
@ApiOperation(value = "根据商家id，运营商id，返回针对该商家的预约列表", notes = "需要鉴权")
public TableDataInfo store_user_like_go_list(@RequestBody SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq, HttpServletRequest request)
{
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkServiceAndSaleWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkServiceAndSaleWebReq.setStoreId(claims.getUserId());
segchkServiceAndSaleWebReq.setProviderId(claims.getProviderId());
}
logger.debug("store_user_like_go_list with: {}", segchkServiceAndSaleWebReq.toString());
startPage();
List<SegchkUserLikeGoWebResp> segchkUserLikeGoWebRespList = segchkStoreIndexService.selectStoreUserLikeGoList(segchkServiceAndSaleWebReq);
return getDataTable(segchkUserLikeGoWebRespList);
@ -195,18 +203,20 @@ public class SegchkDefaultStoreController extends BaseController
@ApiOperation(value = "根据用户id，运营商id，查询seg商户提现列表", notes = "需要鉴权")
public TableDataInfo store_cash_list(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
{
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkUserWebReq.setUserId(claims.getUserId());
segchkUserWebReq.setProviderId(claims.getProviderId());
}
logger.debug("store_cash_list with: {}", segchkUserWebReq.toString());
startPage();
List<SegchkUserCashWebResp> segchkUserWebSCRespList = segchkStoreIndexService.selectStoreCashList(segchkUserWebReq);
return getDataTable(segchkUserWebSCRespList);
@ -227,19 +237,20 @@ public class SegchkDefaultStoreController extends BaseController
@Transactional(propagation = Propagation.REQUIRED)
public AjaxResult service_check_test(Long likegoId, String storeId, String remark, HttpServletRequest request)
{
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
return AjaxResult.error(300, "请先登录注册");
}
if(StringUtils.isEmpty(remark)){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
return AjaxResult.error(300, "请先登录注册");
}
if(!storeId.equals(claims.getUserId())){
logger.warn("ServiceCheckTest---storeid: {} is not then token: {}", storeId, claims);
return AjaxResult.error(300, "请先登录注册");
}
}
AjaxResult ajax = new AjaxResult();
logger.debug("service_check_test with: {}---{}---{}", likegoId.toString(), storeId, remark);
SegchkServiceOrderChkTestResp segchkServiceOrderChkTestResp = segchkUserIndexService.selectUserOrderPredInfo(likegoId);
if(segchkServiceOrderChkTestResp.getStoreId()!= Long.parseLong(storeId)){
@ -296,7 +307,7 @@ public class SegchkDefaultStoreController extends BaseController
* "ret": 1
* }
*/
@Log(title = "seg提现结果回调", businessType = BusinessType.UPDATE)
// @Log(title = "seg提现结果回调", businessType = BusinessType.UPDATE)
@PostMapping( "/userCashResult")
@ResponseBody
@ApiOperation(value = "提现结果回调接口", notes = "需要鉴权")

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

@ -85,26 +85,28 @@ public class SegchkDefaultUserController extends BaseController
*/
// @PreAuthorize("@ss.hasPermi('segchk:user_collect:add')")
@UnAuth
@Log(title = "seg用户收藏记录", businessType = BusinessType.INSERT)
// @Log(title = "seg用户收藏记录", businessType = BusinessType.INSERT)
@PostMapping("/addUserCollect")
@ResponseBody
@ApiOperation(value = "添加seg用户收藏记录", notes = "需要鉴权")
public AjaxResult add_user_collect(@RequestBody SegchkUserCollect segchkUserCollect, HttpServletRequest request)
{
Long userId = 0L;
if(!StringUtils.isEmpty(segchkUserCollect.getRemark())){
// 测试
if(!segchkUserCollect.isValid()){
return AjaxResult.error("400", "请求信息异常");
}
logger.debug("add_user_collect with: {}", segchkUserCollect.toString());
return toAjax(segchkUserCollectService.insertSegchkUserCollect(segchkUserCollect));
}
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
}
if(StringUtils.isEmpty(segchkUserCollect.getRemark())){
/*if(!segchkUserCollect.getUserId().equals(claims.getUserId())){
return AjaxResult.error(301, "用户异常");
}*/
segchkUserCollect.setUserId(claims.getUserId());
segchkUserCollect.setProviderId(claims.getProviderId());
}
segchkUserCollect.setUserId(claims.getUserId());
segchkUserCollect.setProviderId(claims.getProviderId());
logger.debug("add_user_collect with: {}", segchkUserCollect.toString());
return toAjax(segchkUserCollectService.insertSegchkUserCollect(segchkUserCollect));
}
@ -114,19 +116,18 @@ public class SegchkDefaultUserController extends BaseController
*/
// @PreAuthorize("@ss.hasPermi('segchk:user_collect:remove')")
@UnAuth
@Log(title = "删除seg用户收藏记录", businessType = BusinessType.DELETE)
// @Log(title = "删除seg用户收藏记录", businessType = BusinessType.DELETE)
@PostMapping( "/removeUserCollect")
@ResponseBody
@ApiOperation(value = "删除seg用户收藏记录", notes = "需要鉴权")
public AjaxResult removeUserCollect(@RequestBody RemoveIds removeIds, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
}
logger.debug("removeUserCollect with: {}", removeIds.toString());
return toAjax(segchkUserCollectService.deleteSegchkUserCollectByIds(removeIds.getIds()));
}
@ -139,11 +140,16 @@ public class SegchkDefaultUserController extends BaseController
* }
*/
@UnAuth
@Log(title = "查询该用户在该商户可使用的会员卡或优惠券", businessType = BusinessType.GENCODE)
// @Log(title = "查询该用户在该商户可使用的会员卡或优惠券", businessType = BusinessType.GENCODE)
@PostMapping("/userOrderPredList")
@ResponseBody
public TableDataInfo UserOrderPredList(@RequestBody SegchkServiceOrderWebReq segchkServiceOrderWebReq, HttpServletRequest request)
{
startPage();
if(!StringUtils.isEmpty(segchkServiceOrderWebReq.getRemark())){
List<SegchkServiceOrderWebReq> segchkServiceOrderWebReqList = segchkUserIndexService.selectUserOrderPredCardListWebInfo(segchkServiceOrderWebReq);
return getDataTable(segchkServiceOrderWebReqList);
}
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
@ -152,10 +158,7 @@ public class SegchkDefaultUserController extends BaseController
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkServiceOrderWebReq.getRemark())){
segchkServiceOrderWebReq.setUserId(claims.getUserId());
}
startPage();
segchkServiceOrderWebReq.setUserId(claims.getUserId());
List<SegchkServiceOrderWebReq> segchkServiceOrderWebReqList = segchkUserIndexService.selectUserOrderPredCardListWebInfo(segchkServiceOrderWebReq);
return getDataTable(segchkServiceOrderWebReqList);
}
@ -172,23 +175,25 @@ public class SegchkDefaultUserController extends BaseController
*/
// @PreAuthorize("@ss.hasPermi('segchk:user_likego:add')")
@UnAuth
@Log(title = "seg用户想去记录", businessType = BusinessType.INSERT)
// @Log(title = "seg用户想去记录", businessType = BusinessType.INSERT)
@PostMapping("/addOrderUserLikego")
@ResponseBody
@ApiOperation(value = "添加seg用户想去记录", notes = "需要鉴权")
public AjaxResult add_order_user_likego(@RequestBody SegchkUserLikego segchkUserLikego, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
}
if(StringUtils.isEmpty(segchkUserLikego.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
}
segchkUserLikego.setUserId(claims.getUserId());
segchkUserLikego.setProviderId(claims.getProviderId());
}
logger.debug("add_order_user_likego with: {}", segchkUserLikego.toString());
return toAjax(segchkUserLikegoService.insertSegchkUserLikego(segchkUserLikego));
}
@ -237,21 +242,19 @@ public class SegchkDefaultUserController extends BaseController
@ApiOperation(value = "查询seg用户核消列表", notes = "需要鉴权")
public TableDataInfo store_service_check_list(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkUserWebReq.setUserId(claims.getUserId());
}
startPage();
logger.debug("store_service_check_list with: {}", segchkUserWebReq.toString());
List<SegchkUserWebSCResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserServiceCHKList(segchkUserWebReq);
return getDataTable(segchkUserWebSCRespList);
}
@ -266,21 +269,19 @@ public class SegchkDefaultUserController extends BaseController
@ApiOperation(value = "查询seg用户可用会员卡列表或者优惠券列表", notes = "需要鉴权")
public TableDataInfo user_card_list(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkUserWebReq.setUserId(claims.getUserId());
}
startPage();
logger.debug("user_card_list with: {}", segchkUserWebReq.toString());
List<SegchkUserWebCardResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserCardList(segchkUserWebReq);
return getDataTable(segchkUserWebSCRespList);
}
@ -300,21 +301,20 @@ public class SegchkDefaultUserController extends BaseController
@ApiOperation(value = "查询seg用户收藏列表", notes = "需要鉴权")
public TableDataInfo user_collect_list(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkUserWebReq.setUserId(claims.getUserId());
}
startPage();
logger.debug("user_collect_list with: {}", segchkUserWebReq.toString());
List<SegchkUserCollectWebResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserCollectList(segchkUserWebReq);
return getDataTable(segchkUserWebSCRespList);
}
@ -335,20 +335,20 @@ public class SegchkDefaultUserController extends BaseController
@ApiOperation(value = "查询seg用户预约单列表", notes = "需要鉴权")
public TableDataInfo userLikeGOList(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkUserWebReq.setUserId(claims.getUserId());
}
startPage();
logger.debug("userLikeGOList with: {}", segchkUserWebReq.toString());
List<SegchkUserLikeGoWebResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserLikGoList(segchkUserWebReq);
return getDataTable(segchkUserWebSCRespList);
}
@ -358,22 +358,22 @@ public class SegchkDefaultUserController extends BaseController
* 删除seg用户想去记录
*/
// @PreAuthorize("@ss.hasPermi('segchk:user_likego:remove')")
@Log(title = "seg用户想去记录", businessType = BusinessType.DELETE)
// @Log(title = "seg用户想去记录", businessType = BusinessType.DELETE)
@PostMapping( "/removeOrderUserLikego")
@ResponseBody
@ApiOperation(value = "删除seg用户想去记录", notes = "需要鉴权")
public AjaxResult removeOrderUserLikego(@RequestBody RemoveIds removeIds, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
}
if(StringUtils.isEmpty(removeIds.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
return AjaxResult.error(300, "请先登录注册");
}
removeIds.setUserId(claims.getUserId());
}
logger.debug("removeOrderUserLikego with: {}", removeIds.toString());
return toAjax(segchkUserLikegoService.deleteSegchkUserLikegoByLikegoIds(Convert.toLongArray(removeIds.getIds())));
}
@ -384,19 +384,20 @@ public class SegchkDefaultUserController extends BaseController
* }
*/
// @PreAuthorize("@ss.hasPermi('segchk:user_comment:query')")
@Log(title = "seg服务评价查看", businessType = BusinessType.OTHER)
// @Log(title = "seg服务评价查看", businessType = BusinessType.OTHER)
@PostMapping( "/getComment")
@ResponseBody
@ApiOperation(value = "seg服务评价查询", notes = "需要鉴权")
public AjaxResult get_comment(@RequestBody SegchkServiceCommentUserReq segchkServiceCommentUserReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
if(StringUtils.isEmpty(segchkServiceCommentUserReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
return AjaxResult.error(300, "请先登录注册");
}
}
logger.debug("get_comment with: {}", segchkServiceCommentUserReq.toString());
AjaxResult ajax = new AjaxResult();
SegchkServiceComment segchkServiceComment = segchkUserIndexService.selectSegchkServiceComment(segchkServiceCommentUserReq);
if(segchkServiceComment == null){
@ -415,19 +416,20 @@ public class SegchkDefaultUserController extends BaseController
* seg服务评价提交
*/
// @PreAuthorize("@ss.hasPermi('segchk:user_comment:add')")
@Log(title = "seg服务评价提交", businessType = BusinessType.INSERT)
// @Log(title = "seg服务评价提交", businessType = BusinessType.INSERT)
@PostMapping( "/addComment")
@ResponseBody
@ApiOperation(value = "seg服务评价提交", notes = "需要鉴权")
public AjaxResult addComment(@RequestBody SegchkServiceCommentUserReq segchkServiceCommentUserReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
if(StringUtils.isEmpty(segchkServiceCommentUserReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
return AjaxResult.error(300, "请先登录注册");
}
}
logger.debug("addComment with: {}", segchkServiceCommentUserReq.toString());
return toAjax(segchkUserIndexService.insertSegchkServiceComment(segchkServiceCommentUserReq));
}
@ -445,19 +447,19 @@ public class SegchkDefaultUserController extends BaseController
@ApiOperation(value = "查询seg用户充值列表", notes = "需要鉴权")
public TableDataInfo userChargeList(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkUserWebReq.setUserId(claims.getUserId());
}
logger.debug("userChargeList with: {}", segchkUserWebReq.toString());
startPage();
List<SegchkUserChargeWebResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserChargeList(segchkUserWebReq);
return getDataTable(segchkUserWebSCRespList);
@ -473,19 +475,19 @@ public class SegchkDefaultUserController extends BaseController
@ApiOperation(value = "查询seg用户提现列表", notes = "需要鉴权")
public TableDataInfo userCashList(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkUserWebReq.setUserId(claims.getUserId());
}
logger.debug("userCashList with: {}", segchkUserWebReq.toString());
startPage();
List<SegchkUserCashWebResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserCashList(segchkUserWebReq);
return getDataTable(segchkUserWebSCRespList);
@ -507,19 +509,19 @@ public class SegchkDefaultUserController extends BaseController
@ApiOperation(value = "查询seg用户消息列表", notes = "需要鉴权")
public TableDataInfo userMsgList(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
TableDataInfo tableDataInfo = new TableDataInfo();
tableDataInfo.setCode(300);
tableDataInfo.setMsg("请先登录注册");
return tableDataInfo;
}
segchkUserWebReq.setUserId(claims.getUserId());
}
logger.debug("userMsgList with: {}", segchkUserWebReq.toString());
startPage();
List<SegchkMsgWebResp> segchkUserWebSCRespList = segchkUserIndexService.selectUserMsgList(segchkUserWebReq);
return getDataTable(segchkUserWebSCRespList);
@ -539,20 +541,18 @@ public class SegchkDefaultUserController extends BaseController
@ApiOperation(value = "查询seg用户可充值列表", notes = "需要鉴权")
public AjaxResult userChargePre(@RequestBody SegchkUserWebReq segchkUserWebReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
// userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
}
if(StringUtils.isEmpty(segchkUserWebReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
return AjaxResult.error(300, "请先登录注册");
}
segchkUserWebReq.setUserLevel(claims.getUserLevel());
segchkUserWebReq.setUserId(claims.getUserId());
segchkUserWebReq.setProviderId(claims.getProviderId());
}
logger.debug("userChargePre with: {}", segchkUserWebReq.toString());
List<SegchkUserChargeCard> segchkUserChargeCards = segchkUserIndexService.SegchkUserChargePre(segchkUserWebReq);
AjaxResult ajax = new AjaxResult();
@ -582,19 +582,18 @@ public class SegchkDefaultUserController extends BaseController
@ApiOperation(value = "seg用户可充值", notes = "需要鉴权")
public AjaxResult userChargeReq(@RequestBody SegchkUserCharge segchkUserCharge, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
}
if(StringUtils.isEmpty(segchkUserCharge.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
return AjaxResult.error(300, "请先登录注册");
}
segchkUserCharge.setUserId(claims.getUserId());
segchkUserCharge.setProviderId(claims.getProviderId());
}
logger.debug("userChargeReq with: {}", segchkUserCharge.toString());
AjaxResult ajax = new AjaxResult();
// logger.debug(segchkUserCharge.getAccountUsed());
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){
@ -646,7 +645,7 @@ public class SegchkDefaultUserController extends BaseController
* "ret": 0//*0成功，其他失败
* }
*/
@Log(title = "seg用户充值结果回调", businessType = BusinessType.UPDATE)
// @Log(title = "seg用户充值结果回调", businessType = BusinessType.UPDATE)
@PostMapping( "/userChargeResult")
@ResponseBody
@ApiOperation(value = "seg用户充值结果回调", notes = "需要鉴权")
@ -683,18 +682,17 @@ public class SegchkDefaultUserController extends BaseController
@ApiOperation(value = "seg用户提现请求", notes = "需要鉴权")
public AjaxResult userCashReq(@RequestBody SegchkUserCashOpsReq segchkUserCashOpsReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
}
if(StringUtils.isEmpty(segchkUserCashOpsReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
return AjaxResult.error(300, "请先登录注册");
}
segchkUserCashOpsReq.setUserId(claims.getUserId());
segchkUserCashOpsReq.setProviderId(claims.getProviderId());
segchkUserCashOpsReq.setUserLevel(claims.getUserLevel());
}
logger.debug("userCashReq with: {}", segchkUserCashOpsReq.toString());
AjaxResult ajax = new AjaxResult();
if(segchkUserCashOpsReq.getUserLevel() == 0){
return AjaxResult.error(301, "运营商无法线上提现");
@ -730,24 +728,24 @@ public class SegchkDefaultUserController extends BaseController
* }
*/
// @PreAuthorize("@ss.hasPermi('segchk:user_set:add')")
@Log(title = "seg设置用户信息", businessType = BusinessType.UPDATE)
// @Log(title = "seg设置用户信息", businessType = BusinessType.UPDATE)
@PostMapping( "/SetInfo")
@ResponseBody
@ApiOperation(value = "seg设置用户信息", notes = "需要鉴权")
public AjaxResult SetInfo(@RequestBody SegchkUserSetInfoReq segchkUserSetInfoReq, HttpServletRequest request)
{
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
}
if(StringUtils.isEmpty(segchkUserSetInfoReq.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
return AjaxResult.error(300, "请先登录注册");
}
segchkUserSetInfoReq.setUserId(claims.getUserId());
segchkUserSetInfoReq.setProviderId(claims.getProviderId());
segchkUserSetInfoReq.setUserLevel(claims.getUserLevel());
}
logger.debug("SetInfo with: {}", segchkUserSetInfoReq.toString());
int ret = 0;
if(segchkUserSetInfoReq.getUserLevel() == 2) {
ret = segchkUserIndexService.updateUserInfo(segchkUserSetInfoReq);
@ -771,25 +769,25 @@ public class SegchkDefaultUserController extends BaseController
* }
*/
// @PreAuthorize("@ss.hasPermi('segchk:user_certicify:add')")
@Log(title = "seg设置用户实名信息", businessType = BusinessType.UPDATE)
// @Log(title = "seg设置用户实名信息", businessType = BusinessType.UPDATE)
@PostMapping( "/userCerticify")
@ResponseBody
@ApiOperation(value = "seg设置用户实名信息", notes = "需要鉴权")
public AjaxResult user_certicify(@RequestBody SegchkUserCertificationInfo segchkUserCertificationInfo, HttpServletRequest request)
{
int ret = 0;
Long userId = 0L;
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
userId = getClaims(getToken(request)).getUserId();
return AjaxResult.error(300, "请先登录注册");
}
if(StringUtils.isEmpty(segchkUserCertificationInfo.getRemark())){
Claims claims = getClaims(getToken(request));
if (ObjectUtils.isEmpty(claims)) {
// 如果用户未登录，则要求用户使用手机号登录注册
return AjaxResult.error(300, "请先登录注册");
}
segchkUserCertificationInfo.setUserId(claims.getUserId());
segchkUserCertificationInfo.setProviderId(claims.getProviderId());
// segchkUserCertificationInfo.setUserLevel(claims.getUserLevel());
}
logger.debug("user_certicify with: {}", segchkUserCertificationInfo.toString());
ret = segchkUserIndexService.userCerticify(segchkUserCertificationInfo);
return toAjax(ret);
}
@ -803,7 +801,7 @@ public class SegchkDefaultUserController extends BaseController
* "ret": 1
* }
*/
@Log(title = "seg提现结果回调", businessType = BusinessType.UPDATE)
// @Log(title = "seg提现结果回调", businessType = BusinessType.UPDATE)
@PostMapping( "/userCashResult")
@ResponseBody
@ApiOperation(value = "seg提现结果回调", notes = "需要鉴权")

9
ruoyi-segchk-web/src/main/java/com/ruoyi/util/QrCodeController.java
View File

@ -1,9 +1,12 @@
package com.ruoyi.util;
import com.ruoyi.common.annotation.UnAuth;
import com.ruoyi.login.SegChkLoginController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
@ -24,6 +27,7 @@ import java.io.OutputStream;
@Api(description = "二维码接口")
public class QrCodeController {
private static final Logger logger = LoggerFactory.getLogger(QrCodeController.class);
@Value("${segchk.qr_path}")
private String qrPath;
@ -49,6 +53,7 @@ public class QrCodeController {
})
public void createQrCode(HttpServletResponse response, String url, Integer w, Integer h) {
createQRImg(response, url, w, h);
}
@ -87,8 +92,8 @@ public class QrCodeController {
OutputStream outputStream = null;
try {
outputStream = response.getOutputStream();
QRCodeUtils.createQrCode(url, width, height, "jpg", outputStream);
QRCodeUtils.createQrCode(url, width, height, "jpg", outputStream, qrPath, posterPath);
logger.debug("createQRImg qrPath: {}, posterPath: {}", qrPath, posterPath);
outputStream.flush();
} catch (Exception e) {
e.printStackTrace();

80
ruoyi-segchk-web/src/main/resources/application-dev.yml
View File

@ -1,14 +1,56 @@
# 项目相关配置 商城端
ruoyi:
# 名称
name: RuoYi
# 版本
version: 3.0.0
# 版权年份
copyrightYear: 2019
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置F:\ideaproj\RuoYi-Vue\uploadPath
#，Linux配置 /root/yzychk_vue/uploadPath）
profile: F:\ideaproj\RuoYi-Vue\uploadPath
# 获取ip地址开关
addressEnabled: false
server:
# 服务器的HTTP端口，默认为 8091 测试 9092
port: 8091
servlet:
# 应用的访问路径
context-path: /
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
# tomcat最大线程数，默认为200
max-threads: 800
# Tomcat启动初始化的线程数，默认值25
min-spare-threads: 30
# 数据源配置
spring:
# 文件上传
servlet:
multipart:
# 单个文件大小
max-file-size: 10MB
# 设置总上传的文件大小
max-request-size: 20MB
# 服务模块
devtools:
restart:
# 热部署开关
enabled: true
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://127.0.0.1:8306/segchksaas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: segchksaas
password: 2wsx@WSX
url: jdbc:mysql://10.1.192.113:13306/yzy_ruoyi_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: yzyuser
password: yzy123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
@ -55,11 +97,35 @@ spring:
wall:
config:
multi-statement-allow: true
# redis 配置
redis:
# 地址
host: 10.1.192.113
# 端口，默认为6379
port: 63795
# 数据库索引
database: 0
# 密码
password: retinabd@2020
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 0
# 连接池中的最大空闲连接
max-idle: 8
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
yzytest:
login:
smstest: true
smshost: http://api.ksd106.com:8088/SMSSend.aspx
smssign:
smstest: false
smsplatid: 3
segchk:
qr_path: uploadPath
poster_path: uploadPath
qr_path: C:\Users\Public\Desktop\dome.jpg
poster_path: F:\ideaproj\RuoYi-Vue\ruoyi-segchk\src\main\resources\templates\posters\bg.jpg

71
ruoyi-segchk-web/src/main/resources/application-test.yml
View File

@ -1,71 +0,0 @@
#配置数据源
spring:
datasource:
druid:
master:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://172.22.4.2:3306/yzy_ruoyi_vue?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
username: root
password: oywkpjEi9MW4NL9mR88YTydj9wHE5E
# 初始化连接大小
initial-size: 5
# 最小空闲连接数
min-idle: 5
max-active: 20
max-wait: 30000
# 可关闭的空闲连接间隔时间
time-between-eviction-runs-millis: 60000
# 配置连接在池中的最小生存时间
min-evictable-idle-time-millis: 300000
validation-query: select '1' from dual
test-while-idle: true
test-on-borrow: false
test-on-return: false
# 打开PSCache，并且指定每个连接上PSCache的大小
pool-prepared-statements: true
max-open-prepared-statements: 20
max-pool-prepared-statement-per-connection-size: 20
slave1:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://172.22.4.2:3306/wsfmall_test?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
username: root
password: oywkpjEi9MW4NL9mR88YTydj9wHE5E
# 初始化连接大小
initial-size: 5
# 最小空闲连接数
min-idle: 5
max-active: 20
max-wait: 30000
# 可关闭的空闲连接间隔时间
time-between-eviction-runs-millis: 60000
# 配置连接在池中的最小生存时间
min-evictable-idle-time-millis: 300000
validation-query: select '1' from dual
test-while-idle: true
test-on-borrow: false
test-on-return: false
# 打开PSCache，并且指定每个连接上PSCache的大小
pool-prepared-statements: true
max-open-prepared-statements: 20
max-pool-prepared-statement-per-connection-size: 20
redis:
host: 172.22.0.3
port: 6379
timeout: 100
lettuce:
pool:
max-active: 8
max-idle: 8
min-idle: 2
max-wait: 300
password: sfakjfiju99jjf87LJSDDU8
data:
elasticsearch:
cluster-nodes: 172.22.0.3:9300
messages:
basename: messages/messages
servlet:
multipart:
max-file-size: 15MB

123
ruoyi-segchk-web/src/main/resources/application.yml
View File

@ -1,33 +1,33 @@
# 项目相关配置 商城端
ruoyi:
# 名称
name: RuoYi
# 版本
version: 3.0.0
# 版权年份
copyrightYear: 2019
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置F:\ideaproj\RuoYi-Vue\uploadPath
#，Linux配置 /root/yzychk_vue/uploadPath）
profile: /root/yzychk_vue/uploadPath
# 获取ip地址开关
addressEnabled: false
#ruoyi:
# # 名称
# name: RuoYi
# # 版本
# version: 3.0.0
# # 版权年份
# copyrightYear: 2019
# # 实例演示开关
# demoEnabled: true
# # 文件路径 示例（ Windows配置F:\ideaproj\RuoYi-Vue\uploadPath
# #，Linux配置 /root/yzychk_vue/uploadPath）
# profile: F:\ideaproj\RuoYi-Vue\uploadPath
# # 获取ip地址开关
# addressEnabled: false
# 开发环境配置
server:
# 服务器的HTTP端口，默认为 8091 测试 9092
port: 9092
servlet:
# 应用的访问路径
context-path: /
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
# tomcat最大线程数，默认为200
max-threads: 800
# Tomcat启动初始化的线程数，默认值25
min-spare-threads: 30
#server:
# # 服务器的HTTP端口，默认为 8091 测试 9092
# port: 8091
# servlet:
# # 应用的访问路径
# context-path: /
# tomcat:
# # tomcat的URI编码
# uri-encoding: UTF-8
# # tomcat最大线程数，默认为200
# max-threads: 800
# # Tomcat启动初始化的线程数，默认值25
# min-spare-threads: 30
# 日志配置
logging:
@ -43,40 +43,40 @@ spring:
basename: i18n/messages
profiles:
active: dev
# 文件上传
servlet:
multipart:
# 单个文件大小
max-file-size: 10MB
# 设置总上传的文件大小
max-request-size: 20MB
# 服务模块
devtools:
restart:
# 热部署开关
enabled: true
# redis 配置
redis:
# 地址
host: 127.0.0.1
# 端口，默认为6379
port: 63795
# 数据库索引
database: 3
# 密码
password: retinabd@2020
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 0
# 连接池中的最大空闲连接
max-idle: 8
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
# # 文件上传
# servlet:
# multipart:
# # 单个文件大小
# max-file-size: 10MB
# # 设置总上传的文件大小
# max-request-size: 20MB
# # 服务模块
# devtools:
# restart:
# # 热部署开关
# enabled: true
# # redis 配置
# redis:
# # 地址
# host: 10.1.192.113
# # 端口，默认为6379
# port: 63795
# # 数据库索引
# database: 0
# # 密码
# password: retinabd@2020
# # 连接超时时间
# timeout: 10s
# lettuce:
# pool:
# # 连接池中的最小空闲连接
# min-idle: 0
# # 连接池中的最大空闲连接
# max-idle: 8
# # 连接池的最大数据库连接数
# max-active: 8
# # #连接池最大阻塞等待时间（使用负值表示没有限制）
# max-wait: -1ms
# token配置
token:
@ -118,3 +118,4 @@ xss:
excludes: /system/notice/*
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*

20
ruoyi-segchk-web/src/main/resources/http-client.private.env.json
View File

@ -1,6 +1,26 @@
{
"dev": {
"name": "value",
"host": "http://localhost:8091",
"bindtoken": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzY0tDCwtLDQUSotTi3yTFGyMjUw1lEqKMovy0yBCBhB5HxSy1JzwLzUigKYVhNTC4taAAAAAP__.diChD7JjY3y8SBNTBE8ACoNWWIuz-r-mHESPfL73eZI",
"bindtoken1": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzYyNDQwNDLVUSotTi3yTFGyMjUw1lEqKMovy0yBCBhB5HxSy1JzwLzUigKYVmNzI9NaAAAAAP__.Y5uJzL55q9baNor4ScWmVg9UZyfHkTxZ0Oz79guiXXg",
// "token2": "APPLET_LOGIN_KEY_885553054366171136abcdefghijklmnopqrstuvwxyz",
"token3": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUipPTc5ILMnJT8_MU9JRykwsUbIyNDM2NDQ3sDAx0VEqLU4t8kxRsjLWUSooyi_LTIFwjSAyPqllqTlgXmpFAUyjCRDUAgAAAP__.5qRMCYs8YUoFJdSo_XSZiGlqJ13LGa20qJAT8GoiMHg",
"providertoken": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzY0MjC1MDTWUSotTi3yTFGyMtJRKijKL8tMgXNBMj6pZak5SlYGOkqpFQUwjZYmhsa1AAAAAP__.DkyBrM5f7G0eLi7DnYpgAqGTYnLaWRrpD3xemTa1s3k",
"store_search":
{
"providerId": 2,
"sortType": 0,
"storeName": "99",
"lableName": "99",
"typeId": 1,
"userLon": 114.123456,
"userLat": 43.123456
}
},
"prod-test": {
"name": "value",
"host": "https://segchksaas.mynatapp.cc",
"bindtoken": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzY0tDCwtLDQUSotTi3yTFGyMjUw1lEqKMovy0yBCBhB5HxSy1JzwLzUigKYVhNTC4taAAAAAP__.diChD7JjY3y8SBNTBE8ACoNWWIuz-r-mHESPfL73eZI",
"bindtoken1": "eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNqqViouTVKyUnIMCPBxDYn38Xf39Iv3do1U0lHKTCxRsjI0MzYyNDQwNDLVUSotTi3yTFGyMjUw1lEqKMovy0yBCBhB5HxSy1JzwLzUigKYVmNzI9NaAAAAAP__.Y5uJzL55q9baNor4ScWmVg9UZyfHkTxZ0Oz79guiXXg",
// "token2": "APPLET_LOGIN_KEY_885553054366171136abcdefghijklmnopqrstuvwxyz",

95
ruoyi-segchk-web/src/main/resources/test.http
View File

@ -1,11 +1,22 @@
POST http://api.ksd106.com:8088/SMSSend.aspx
Content-Type: application/x-www-form-urlencoded
Account=KSD8141161&Password=123456a&Mobile=18515184399&Content=测试验证码短信【河北赛格】&Extnum=&Time=*
###
POST https://segchksaas.xyz//querybaseinfoset
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
{}
###
GET https://api.weixin.qq.com/sns/jscode2session?appid=wx2ce4e2083b3a871a&secret=adc865e9ab24ab23b534f9ca5c0960b3&js_code=053okall2BHyK74GMcol2S8Exc0okaln&grant_type=authorization_code
Accept: */*
###
GET http://localhost:8091//createqrcode?url="http://yxr8cu.natappfree.cc//tokentest?dfasdf=1+werwer=1231"&w=300&h=300
GET {{host}}//createqrcode?url="http://yxr8cu.natappfree.cc//tokentest?dfasdf=1+werwer=1231"&w=300&h=300
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -15,7 +26,7 @@ Content-Type: application/json
############### 商家接口测试 ####################
### 商家核消操作
POST http://localhost:8091//default/store/ServiceCheckTest?likegoId=16877&storeId=128&remark=999999
POST {{host}}//default/store/ServiceCheckTest?likegoId=16877&storeId=128&remark=999999
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -23,7 +34,7 @@ Authorization: Bearer {{bindtoken}}
### 根据用户id，运营商id，查询seg商户提现列表
POST http://localhost:8091//default/store/storeCashList
POST {{host}}//default/store/storeCashList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -37,7 +48,7 @@ Authorization: Bearer {{bindtoken}}
}
###
POST http://localhost:8091//default/store/storeUserLikeGoList
POST {{host}}//default/store/storeUserLikeGoList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -51,7 +62,7 @@ Authorization: Bearer {{bindtoken}}
}
###
POST http://localhost:8091//default/store/storeServiceAndSaleDetails
POST {{host}}//default/store/storeServiceAndSaleDetails
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -66,7 +77,7 @@ Authorization: Bearer {{bindtoken}}
}
### 根据商家id，运营商id，角色等级，返回核消统计或售卡统计
POST http://localhost:8091//default/store/storeServiceAndSaleList
POST {{host}}//default/store/storeServiceAndSaleList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -85,7 +96,7 @@ Authorization: Bearer {{bindtoken}}
############### 用户接口测试 ####################
###
POST http://localhost:8091//default/user/userCashReq
POST {{host}}//default/user/userCashReq
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -126,7 +137,7 @@ Authorization: Bearer {{bindtoken1}}
# }
# }
#}
POST http://localhost:8091//default/user/userChargeReq
POST {{host}}//default/user/userChargeReq
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -142,7 +153,7 @@ Authorization: Bearer {{bindtoken1}}
### 用户充值请求
POST http://localhost:8091//default/user/userChargePre
POST {{host}}//default/user/userChargePre
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -155,7 +166,7 @@ Authorization: Bearer {{bindtoken1}}
}
### 查询seg用户消息列表
POST http://localhost:8091//default/user/userMsgList
POST {{host}}//default/user/userMsgList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -170,7 +181,7 @@ Authorization: Bearer {{bindtoken}}
}
### 查询seg用户提现列表
POST http://localhost:8091//default/user/userCashList
POST {{host}}//default/user/userCashList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -183,7 +194,7 @@ Authorization: Bearer {{bindtoken}}
}
### 查询seg用户充值列表
POST http://localhost:8091//default/user/userChargeList
POST {{host}}//default/user/userChargeList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -196,7 +207,7 @@ Authorization: Bearer {{bindtoken}}
}
### seg服务评价提交
POST http://localhost:8091//default/user/addComment
POST {{host}}//default/user/addComment
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -209,7 +220,7 @@ Authorization: Bearer {{bindtoken}}
}
### seg服务评价查询
POST http://localhost:8091//default/user/getComment
POST {{host}}//default/user/getComment
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -220,7 +231,7 @@ Authorization: Bearer {{bindtoken}}
}
### 删除seg用户想去记录
POST http://localhost:8091//default/user/removeOrderUserLikego
POST {{host}}//default/user/removeOrderUserLikego
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -232,7 +243,7 @@ Authorization: Bearer {{bindtoken}}
}
### 查询seg用户收藏列表
POST http://localhost:8091//default/user/userLikeGOList
POST {{host}}//default/user/userLikeGOList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -279,7 +290,7 @@ Authorization: Bearer {{bindtoken}}
# "code": 200,
# "msg": "查询成功"
#}
POST http://localhost:8091//default/user/userCollectList
POST {{host}}//default/user/userCollectList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -327,7 +338,7 @@ Authorization: Bearer {{bindtoken}}
# "code": 200,
# "msg": "查询成功"
#}
POST http://localhost:8091//default/user/userCardList
POST {{host}}//default/user/userCardList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -364,7 +375,7 @@ Authorization: Bearer {{bindtoken}}
# "code": 200,
# "msg": "查询成功"
#}
POST http://localhost:8091//default/user/storeServiceCheckList
POST {{host}}//default/user/storeServiceCheckList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -378,7 +389,7 @@ Authorization: Bearer {{bindtoken}}
###
### 添加seg用户想去记录
POST http://localhost:8091//default/user/addOrderUserLikego
POST {{host}}//default/user/addOrderUserLikego
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -413,7 +424,7 @@ Authorization: Bearer {{bindtoken}}
# "code": 200,
# "msg": "查询成功"
#}
POST http://localhost:8091//default/user/userOrderPredList
POST {{host}}//default/user/userOrderPredList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -429,7 +440,7 @@ Authorization: Bearer {{bindtoken}}
###
### 根据收藏id，删除收藏列表 ids：要删除的收藏列表id，删除多个时，使用逗号拼接
POST http://localhost:8091//default/user/removeUserCollect
POST {{host}}//default/user/removeUserCollect
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -442,7 +453,7 @@ Authorization: Bearer {{bindtoken}}
###
### seg用户收藏记录
POST http://localhost:8091//default/user/addUserCollect
POST {{host}}//default/user/addUserCollect
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -452,7 +463,7 @@ Authorization: Bearer {{bindtoken}}
"collectType": "1",
"providerId": 2,
"userId": 8,
"storeId": 12,
"storeId": 13,
"mgtState": 0,
"remark": "999999"
}
@ -491,7 +502,7 @@ Authorization: Bearer {{bindtoken}}
# "code": 200,
# "msg": "查询成功"
#}
POST http://localhost:8091//default/provider/providerServiceAndSaleDetails
POST {{host}}//default/provider/providerServiceAndSaleDetails
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -532,7 +543,7 @@ Authorization: Bearer {{providertoken}}
# "code": 200,
# "msg": "查询成功"
#}
POST http://localhost:8091//default/provider/providerServiceAndSaleList
POST {{host}}//default/provider/providerServiceAndSaleList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -545,7 +556,7 @@ Authorization: Bearer {{providertoken}}
}
###
GET http://localhost:8091/register
GET {{host}}/register
Accept: application/json
Content-Type: application/json
@ -556,7 +567,7 @@ Content-Type: application/json
}
### 无token登录 Authorization: Bearer {{providertoken}}使用token登录
POST http://localhost:8091/login
POST {{host}}/login
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -587,7 +598,7 @@ Authorization: Bearer {{providertoken}}
# ""code"": 200,
# ""msg"": ""查询成功""
#}"
POST http://localhost:8091//default/index/storeCommentList
POST {{host}}//default/index/storeCommentList
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -643,7 +654,7 @@ Content-Type: application/json
# },
# "recommenderLevel": "1"//推荐人角色，只在在url后面带有该参数时才会返回该值
#}
POST http://localhost:8091//default/index/storeDetails?recommenderId=124&recommenderLevel=1
POST {{host}}//default/index/storeDetails?recommenderId=124&recommenderLevel=1
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -670,7 +681,7 @@ Content-Type: application/json
# "code": 200,
# "msg": "查询成功"
#}
POST http://localhost:8091//default/index/getBannersByProvider
POST {{host}}//default/index/getBannersByProvider
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -681,7 +692,7 @@ Content-Type: application/json
###
### 根据标签id,会员卡类型id，搜索商户列表
POST http://localhost:8091//default/index/listByProviderwithLable
POST {{host}}//default/index/listByProviderwithLable
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -697,7 +708,7 @@ Content-Type: application/json
###
### 根据运营商id查询seg首页推荐商户列表
POST http://localhost:8091//default/index/listByProvider
POST {{host}}//default/index/listByProvider
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -752,7 +763,7 @@ Content-Type: application/json
# "code": 200,
# "msg": "查询成功"
#}
POST http://localhost:8091//default/index/StoreSearch
POST {{host}}//default/index/StoreSearch
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -783,7 +794,7 @@ Content-Type: application/json
# ""code"": 200,
# ""msg"": ""查询成功""
#}"
GET http://localhost:8091//default/index/lableListByProvider?providerId=2
GET {{host}}//default/index/lableListByProvider?providerId=2
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -795,7 +806,7 @@ Content-Type: application/json
# "code": 200,
# "data": 2//该值用于在小程序内部留存，在后续接口请求时都会用到
#}
GET http://localhost:8091//default/index/getProviderByadcode
GET {{host}}//default/index/getProviderByadcode
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -804,7 +815,7 @@ Content-Type: application/json
###
### 测试微信账号绑定
GET http://localhost:8091//bindaccount
GET {{host}}//bindaccount
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -818,14 +829,14 @@ Authorization: Bearer {{token1}}
}
### 测试token取值
GET http://localhost:8091/tokentest
GET {{host}}/tokentest
Accept: application/json
Content-Type: application/json
{{bindtoken1}}
### 用户利用token进行登录
POST http://yxr8cu.natappfree.cc/login
POST {{host}}/login
Accept: */*
Cache-Control: no-cache
Content-Type: application/json
@ -839,7 +850,7 @@ Authorization: Bearer {{bindtoken}}
}
### 已有用户的登录注册标识
GET http://localhost:8091/register
GET {{host}}/register
Accept: application/json
Content-Type: application/json
@ -853,7 +864,7 @@ Content-Type: application/json
> {% client.global.set("token2", response.body.data.token); %}
### 进行新用户注册 remark测试标识
GET http://localhost:8091/register
GET {{host}}/register
Accept: application/json
Content-Type: application/json
@ -869,7 +880,7 @@ Content-Type: application/json
> {% client.global.set("token1", response.body.data.token); %}
### 发送短信验证码
POST http://localhost:8091/sendmobilecode?mobile=99999999999
POST {{host}}/sendmobilecode?mobile=99999999999
Accept: */*
Cache-Control: no-cache
Content-Type: application/json

2
ruoyi-segchk/pom.xml
View File

@ -6,7 +6,7 @@
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.6.0</version>
<relativePath>../pom.xml</relativePath>
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>
<modelVersion>4.0.0</modelVersion>

8
ruoyi-segchk/src/main/java/com/ruoyi/member/service/RegisterService.java
View File

@ -16,6 +16,14 @@ public interface RegisterService {
* @return 0 成功 1 失败 -1 手机号码已经存在
*/
int sendRegisterSmsCode(String mobile, Consumer<String> consumer);
/**
* 发送注册短信验证码
*
* @param mobile 手机号码
* @param consumer 回调接口
* @return 0 成功 1 失败 -1 手机号码已经存在
*/
int sendRegisterSmsCodeFortest(String mobile, Consumer<String> consumer);
/**
* 发送注册短信验证码（PC端用，带有图片验证码）

23
ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/LoginServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.member.service.LoginService;
import com.ruoyi.member.service.RegisterService;
import com.ruoyi.segchk.domain.SegchkUserWebReq;
import com.ruoyi.segchk.domain.SegchkUserWebResp;
import com.ruoyi.segchk.service.ISegchkProviderIndexService;
import com.ruoyi.segchk.service.ISegchkStoreIndexService;
import com.ruoyi.segchk.service.ISegchkUserIndexService;
@ -176,10 +177,26 @@ public class LoginServiceImpl implements LoginService {
@Override
public AjaxResult login(SegchkUserWebReq segchkUserWebReq) {
AjaxResult ajaxResult = null;
SegchkUserWebResp segchkUserWebResp = null;
switch (segchkUserWebReq.getUserLevel()){
case 0: ajaxResult = AjaxResult.success(segchkProviderIndexService.selectSegchkProviderWebInfo(segchkUserWebReq));break;
case 1: ajaxResult = AjaxResult.success(segchkStoreIndexService.selectSegchkStoreWebInfo(segchkUserWebReq));break;
case 2: ajaxResult = AjaxResult.success(segchkUserIndexService.selectSegchkUserWebInfo(segchkUserWebReq));break;
case 0: {
segchkUserWebResp = segchkProviderIndexService.selectSegchkProviderWebInfo(segchkUserWebReq);
segchkUserWebResp.setUserLevel(0);
ajaxResult = AjaxResult.success(segchkUserWebResp);
break;
}
case 1: {
segchkUserWebResp = segchkStoreIndexService.selectSegchkStoreWebInfo(segchkUserWebReq);
segchkUserWebResp.setUserLevel(1);
ajaxResult = AjaxResult.success(segchkUserWebResp);
break;
}
case 2: {
segchkUserWebResp = segchkUserIndexService.selectSegchkUserWebInfo(segchkUserWebReq);
segchkUserWebResp.setUserLevel(2);
ajaxResult = AjaxResult.success(segchkUserWebResp);
break;
}
default: ajaxResult = AjaxResult.error("301", "用户身份异常");
}
return ajaxResult;

44
ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/RegisterServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.ruoyi.member.service.SmsService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@ -31,6 +32,13 @@ public class RegisterServiceImpl implements RegisterService {
@Autowired
private SmsService smsService;
/**
* 短信测试标志，true/false
*/
@Value("${yzytest.login.smstest}")
private Boolean smstest;
/**
* 注入会员服务接口
*/
@ -68,6 +76,42 @@ public class RegisterServiceImpl implements RegisterService {
return 0;
}
/**
* 发送注册短信验证码
*
* @param mobile 手机号码
* @param consumer 回调接口
* @return 0 成功 1 失败 -1 手机号码已经存在
*/
@Override
public int sendRegisterSmsCodeFortest(String mobile, Consumer<String> consumer) {
logger.debug("sendRegisterSmsCodeFortest and mobile:{}");
// 如果要注册的手机号码存在 则直接返回
/*if (customerService.isMobileExist(mobile) != 0) {
logger.error("sendRegisterSmsCode fail due to mobile :{} is exist...", mobile);
return -1;
}*/
// 生成的6位数数字
String code = String.format("%06d", (int) (Math.random() * 1000000));
logger.warn("sendRegisterSmsCodeFortest smstest: {}", smstest);
if(smstest){
code = "1234";
}
else if (smsService.sendSms(mobile, code) == 1) {
// 短信验证码发送失败
logger.error("send sms fail....");
return 1;
}
// 发送成功后回调
if (Objects.nonNull(consumer)) {
consumer.accept(code);
}
return 0;
}
@Override
public int sendRegisterSmsCodeForPc(String mobile, String kaptcha, String oldKaptcha, Consumer<String> consumer) {

86
ruoyi-segchk/src/main/java/com/ruoyi/member/service/impl/SmsServiceImpl.java
View File

@ -5,15 +5,31 @@ import com.ruoyi.member.service.SmsService;
import com.ruoyi.setting.domain.LsSmsSetting;
import com.ruoyi.setting.service.ILsSmsSettingService;
import com.ruoyi.util.SmsUtil;
import com.ruoyi.util.WechatUtils;
import com.ruoyi.util.bean.RequestParam;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.config.RegistryBuilder;
import org.apache.http.conn.socket.ConnectionSocketFactory;
import org.apache.http.conn.socket.PlainConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
import java.util.*;
/**
* Created by 魔金商城 on 17/11/18.
@ -36,6 +52,12 @@ public class SmsServiceImpl implements SmsService {
@Autowired
private ILsSmsSettingService smsSetService;
/**
* 短信测试标志，true/false
*/
@Value("${yzytest.login.smsplatid}")
private Integer smsplatId;
@Override
public int sendSms(String phone, String content) {
int result = 1;
@ -54,11 +76,30 @@ public class SmsServiceImpl implements SmsService {
requestParam.setTemplateCode(smsSet.getTemplateId());
requestParam.setTemplateParam("{\"code\":\"" + content + "\"}");
result = SmsUtil.newSendSms(requestParam);
} else if (smsSet.getId() == 2 && smsSet.getStatus()) { // 腾讯云短信
}
else if (smsSet.getId() == 2 && smsSet.getStatus()) { // 腾讯云短信
String[] params = new String[1];
params[0] = content;
result = SendTencentSms.sendMessage(smsSet, params, phone);
}
else if(smsSet.getId() == smsplatId.longValue() && smsSet.getStatus() && smsSet.getTemplateId().equals("KSD_SMSCODE")){
// 快速达短信平台发送短信
List<NameValuePair> params = new ArrayList<NameValuePair>();
params.add(new BasicNameValuePair("Account", smsSet.getKey()));
params.add(new BasicNameValuePair("Password", smsSet.getSecret()));
params.add(new BasicNameValuePair("Mobile", phone));
params.add(new BasicNameValuePair("Content", smsSet.getSign().replace("content", content)));
params.add(new BasicNameValuePair("Extnum", null));
params.add(new BasicNameValuePair("Time", null));
logger.debug("sendsms KSD with: {}", smsSet.toString());
String smsRet = executeHttpPost(smsSet.getUrl(), params);
if(smsRet.startsWith("SUCCESS")){
result = 0;
}
else {
logger.error("{} send sms wrong with: {}", smsSet.getTemplateId(), smsRet);
}
}
}
return result;
}
@ -217,4 +258,43 @@ public class SmsServiceImpl implements SmsService {
return requestParam;
}
/**
* 执行POST方法请求数据
*
* @param url 请求地址
* @param params 请求参数
* @return 返回数据
*/
private String executeHttpPost(String url, List<NameValuePair> params) {
logger.debug("executeHttpPost and url:{}", url);
String result = null;
BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager(
RegistryBuilder.<ConnectionSocketFactory>create()
.register("http", PlainConnectionSocketFactory.getSocketFactory())
.register("https", SSLConnectionSocketFactory.getSocketFactory())
.build(),
null,
null,
null
);
HttpClient httpClient = HttpClientBuilder.create()
.setConnectionManager(connManager)
.build();
HttpPost httpRequest = new HttpPost(url);
try {
httpRequest.setEntity(new UrlEncodedFormEntity(params,"UTF-8"));
httpRequest.setHeader("Content-type", "application/x-www-form-urlencoded");
//使用DefaultHttpClient类的execute方法发送HTTP GET请求，并返回HttpResponse对象。
HttpResponse httpResponse = httpClient.execute(httpRequest);//其中HttpGet是HttpUriRequst的子类
HttpEntity httpEntity = httpResponse.getEntity();
result = EntityUtils.toString(httpEntity, "UTF-8");//取出应答字符串
} catch (Exception e) {
e.printStackTrace();
}
return result;
}
}

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

@ -25,6 +25,10 @@ public class SegchkUserWebResp extends BaseEntity
@Excel(name = "用户id，全局唯一")
private Long userId;
/** 用户角色 */
@Excel(name = "用户角色")
private Integer userLevel;
/** 用户手机号 */
@Excel(name = "用户手机号")
private String phoneNo;
@ -194,28 +198,6 @@ public class SegchkUserWebResp extends BaseEntity
this.providerId = providerId;
}
@Override
public String toString() {
return "SegchkUserWebResp{" +
"providerId=" + providerId +
", userId=" + userId +
", phoneNo='" + phoneNo + '\'' +
", userName='" + userName + '\'' +
", openid='" + openid + '\'' +
", userIcon='" + userIcon + '\'' +
", iscertified=" + iscertified +
", account=" + account +
", chkCount=" + chkCount +
", chargeCount=" + chargeCount +
", cashCount=" + cashCount +
", msgCount=" + msgCount +
", cardCount=" + cardCount +
", storecardCount=" + storeCardCount +
", storeCount=" + storeCount +
", likegoCount=" + likegoCount +
'}';
}
public Long getStoreCardCount() {
return storeCardCount;
}
@ -239,4 +221,35 @@ public class SegchkUserWebResp extends BaseEntity
public void setLikegoCount(Long likegoCount) {
this.likegoCount = likegoCount;
}
public Integer getUserLevel() {
return userLevel;
}
public void setUserLevel(Integer userLevel) {
this.userLevel = userLevel;
}
@Override
public String toString() {
return "SegchkUserWebResp{" +
"providerId=" + providerId +
", userId=" + userId +
", userLevel=" + userLevel +
", phoneNo='" + phoneNo + '\'' +
", userName='" + userName + '\'' +
", openid='" + openid + '\'' +
", userIcon='" + userIcon + '\'' +
", iscertified=" + iscertified +
", account=" + account +
", chkCount=" + chkCount +
", chargeCount=" + chargeCount +
", cashCount=" + cashCount +
", msgCount=" + msgCount +
", cardCount=" + cardCount +
", storeCardCount=" + storeCardCount +
", storeCount=" + storeCount +
", likegoCount=" + likegoCount +
'}';
}
}

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

@ -4,6 +4,7 @@ import com.ruoyi.segchk.domain.*;
import com.ruoyi.segchk.domain.WeChatCustomerLink;
import java.util.List;
import java.util.Map;
public interface SegchkStoreIndexMapper {
/**
@ -116,4 +117,6 @@ public interface SegchkStoreIndexMapper {
* @return 结果
*/
public WeChatCustomerLink selectStoreOpenIdById(Long storeId);
public Integer isCollectByUser(Map<String, Object> params);
}

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

@ -155,4 +155,15 @@ public interface ISegchkStoreIndexService
* @return 结果
*/
int recommenderIsExit(String recommenderId, String recommenderLevel, String providerId);
/**
* 检查该商户是否已被当前用户收藏
*
* @param providerId 推荐人id
* @param storeId 推荐人角色
* @param userId 推荐人角色
* @return 是否收藏，1已收藏，0未收藏
*/
Integer isCollectByUser(Long providerId, Long storeId, Long userId);
}

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

@ -8,6 +8,8 @@ import com.ruoyi.segchk.mapper.SegchkStoreSecurityMapper;
import com.ruoyi.segchk.service.ISegchkStoreIndexService;
import com.ruoyi.segchk.domain.WeChatCustomerLink;
import com.ruoyi.segchk.service.ISegchkUserIndexService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -18,6 +20,8 @@ import java.util.Map;
@Service
public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
private static final Logger logger = LoggerFactory.getLogger(ISegchkStoreIndexServiceImpl.class);
@Autowired
private SegchkStoreIndexMapper segchkStoreIndexMapper;
@ -40,6 +44,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public List<SegchkStoreIndexWebResp> selectSegchkStoreList(SegchkStoreWebReq segchkStoreWebReq) {
logger.debug("selectSegchkStoreList with: {}", segchkStoreWebReq.toString());
if(segchkStoreWebReq.getProviderId() == null){
segchkStoreWebReq.setProviderId(0l);
}
@ -57,6 +62,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public List<SegchkRecommenderStoreLableWeb> selectSegchkStoreLableList(Long providerId) {
logger.debug("selectSegchkStoreLableList with: {}", providerId);
return segchkStoreIndexMapper.selectSegchkStoreLableList(providerId);
}
@ -68,6 +74,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public List<SegchkStoreIndexWebResp> selectSegchkStoreSearch(SegchkStoreWebReq segchkStoreWebReq) {
logger.debug("selectSegchkStoreSearch with: {}", segchkStoreWebReq.toString());
return segchkStoreIndexMapper.selectSegchkStoreSearch(segchkStoreWebReq);
}
@ -79,6 +86,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public SegchkStoreBasicInfoWebResp selectSegchkStoreDetails(SegchkStoreWebReq segchkStoreWebReq) {
logger.debug("selectSegchkStoreDetails with: {}", segchkStoreWebReq.toString());
return segchkStoreIndexMapper.selectSegchkStoreDetails(segchkStoreWebReq);
}
@ -90,6 +98,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public List<SegchkServiceCommentWebResp> selectSegchkStoreComments(SegchkStoreWebReq segchkStoreWebReq) {
logger.debug("selectSegchkStoreComments with: {}", segchkStoreWebReq.toString());
return segchkStoreIndexMapper.selectSegchkStoreComments(segchkStoreWebReq);
}
@ -101,6 +110,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public SegchkUserWebResp selectSegchkStoreWebInfo(SegchkUserWebReq segchkUserWebReq) {
logger.debug("selectSegchkStoreWebInfo with: {}", segchkUserWebReq.toString());
return segchkStoreIndexMapper.selectSegchkStoreWebInfo(segchkUserWebReq);
}
@ -121,6 +131,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public List<SegchkServiceAndSaleWebResp> selectStoreServiceAndSaleList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq) {
logger.debug("selectStoreServiceAndSaleList with: {}", segchkServiceAndSaleWebReq.toString());
if(segchkServiceAndSaleWebReq.getSrcFlag() == 0)
return segchkStoreIndexMapper.selectSegchkStoreServiceList(segchkServiceAndSaleWebReq);
else
@ -135,6 +146,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public List<SegchkServiceAndSaleDetailWebResp> selectStoreServiceAndSaleDetails(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq) {
logger.debug("selectStoreServiceAndSaleDetails with: {}", segchkServiceAndSaleWebReq.toString());
if(segchkServiceAndSaleWebReq.getSrcFlag() == 0)
return segchkStoreIndexMapper.selectSegchkStoreServiceDetails(segchkServiceAndSaleWebReq);
else
@ -148,6 +160,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public List<SegchkUserCashWebResp> selectStoreCashList(SegchkUserWebReq segchkUserWebReq) {
logger.debug("selectStoreCashList with: {}", segchkUserWebReq.toString());
return segchkStoreIndexMapper.selectStoreCashList(segchkUserWebReq);
}
@ -159,6 +172,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public List<SegchkUserLikeGoWebResp> selectStoreUserLikeGoList(SegchkServiceAndSaleWebReq segchkServiceAndSaleWebReq) {
logger.debug("selectStoreUserLikeGoList with: {}", segchkServiceAndSaleWebReq.toString());
return segchkStoreIndexMapper.selectStoreUserLikeGoList(segchkServiceAndSaleWebReq);
}
@ -170,6 +184,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public Long getProvider(Long adcode) {
logger.debug("getProvider with: {}", adcode);
return segchkStoreIndexMapper.selectSegchkProviderBycode(adcode);
}
@ -182,6 +197,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public void cashRet(String chargeId, int ret) {
logger.debug("cashRet with: {}---{}", chargeId, ret);
int opsRet = 0;
SegchkStoreCash segchkStoreCash = new SegchkStoreCash();
segchkStoreCash.setCashId(Long.valueOf(chargeId));
@ -200,6 +216,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public List<SegchkCarouseMgt> getBanners(Long providerId) {
logger.debug("getBanners with: {}", providerId);
SegchkCarouseMgt segchkCarouseMgt = new SegchkCarouseMgt();
segchkCarouseMgt.setProviderId(providerId);
segchkCarouseMgt.setMgtState(0);
@ -215,6 +232,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public int updateUserInfo(SegchkUserSetInfoReq segchkUserSetInfoReq) {
logger.debug("updateUserInfo with: {}", segchkUserSetInfoReq.toString());
SegchkStoreSecurity segchkStoreSecurity = new SegchkStoreSecurity();
segchkStoreSecurity.setPasswd(segchkUserSetInfoReq.getPasswd());
segchkStoreSecurity.setProviderId(segchkUserSetInfoReq.getProviderId());
@ -231,6 +249,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public List<SegchkRecommenderStoreWebResp> selectSegchkRecommenderStoreListByProvider(SegchkRecommenderStoreWebReq segchkRecommenderStoreWebReq) {
logger.debug("selectSegchkRecommenderStoreListByProvider with: {}", segchkRecommenderStoreWebReq.toString());
return segchkStoreIndexMapper.selectSegchkRecommenderStoreListWeb(segchkRecommenderStoreWebReq);
}
@ -242,6 +261,7 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public WeChatCustomerLink selectWeChatInfoByStoreId(Long storeId) {
logger.debug("selectWeChatInfoByStoreId with: {}", storeId);
return segchkStoreIndexMapper.selectStoreOpenIdById(storeId);
}
@ -254,10 +274,29 @@ public class ISegchkStoreIndexServiceImpl implements ISegchkStoreIndexService {
*/
@Override
public int recommenderIsExit(String recommenderId, String recommenderLevel, String providerId) {
logger.debug("recommenderIsExit with: {}---{}---{}", recommenderId, recommenderLevel, providerId);
Map<String, Object> parmMap = new HashMap<>();
parmMap.put("userId", recommenderId);
parmMap.put("userLevel", recommenderLevel);
parmMap.put("providerId", providerId);
return segchkUserIndexService.recommenderIsExit(parmMap);
}
/**
* 检查该商户是否已被当前用户收藏
*
* @param providerId 推荐人id
* @param storeId 推荐人角色
* @param userId 推荐人角色
* @return 是否收藏，1已收藏，0未收藏
*/
@Override
public Integer isCollectByUser(Long providerId, Long storeId, Long userId) {
logger.debug("isCollectByUser with: {}---{}---{}", providerId, storeId, userId);
Map<String, Object> params = new HashMap<>();
params.put("providerId", providerId);
params.put("storeId", storeId);
params.put("userId", userId);
return segchkStoreIndexMapper.isCollectByUser(params);
}
}

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

@ -124,6 +124,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public SegchkUserWebResp selectSegchkUserWebInfo(SegchkUserWebReq segchkUserWebReq) {
logger.debug("selectSegchkUserWebInfo with: {}", segchkUserWebReq.toString());
return segchkUserIndexMapper.selectSegchkUserWebInfo(segchkUserWebReq);
}
@ -135,6 +136,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public List<SegchkUserWebSCResp> selectUserServiceCHKList(SegchkUserWebReq segchkUserWebReq) {
logger.debug("selectUserServiceCHKList with: {}", segchkUserWebReq.toString());
return segchkUserIndexMapper.selectUserServiceCHKList(segchkUserWebReq);
}
@ -146,6 +148,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public List<SegchkUserWebCardResp> selectUserCardList(SegchkUserWebReq segchkUserWebReq) {
logger.debug("selectUserCardList with: {}", segchkUserWebReq.toString());
if(segchkUserWebReq.getUserLevel() == 0 || segchkUserWebReq.getUserLevel() == null) {
return segchkUserIndexMapper.selectUserCardList(segchkUserWebReq);
}
@ -162,6 +165,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public List<SegchkUserCollectWebResp> selectUserCollectList(SegchkUserWebReq segchkUserWebReq) {
logger.debug("selectUserCollectList with: {}", segchkUserWebReq.toString());
return segchkUserIndexMapper.selectUserCollectList(segchkUserWebReq);
}
@ -172,6 +176,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public List<SegchkUserLikeGoWebResp> selectUserLikGoList(SegchkUserWebReq segchkUserWebReq) {
logger.debug("selectUserLikGoList with: {}", segchkUserWebReq.toString());
return segchkUserIndexMapper.selectUserLikGoList(segchkUserWebReq);
}
@ -182,6 +187,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public List<SegchkUserChargeWebResp> selectUserChargeList(SegchkUserWebReq segchkUserWebReq) {
logger.debug("selectUserChargeList with: {}", segchkUserWebReq.toString());
return segchkUserIndexMapper.selectUserChargeList(segchkUserWebReq);
}
@ -192,6 +198,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public List<SegchkUserCashWebResp> selectUserCashList(SegchkUserWebReq segchkUserWebReq) {
logger.debug("selectUserCashList with: {}", segchkUserWebReq.toString());
return segchkUserIndexMapper.selectUserCashList(segchkUserWebReq);
}
@ -202,6 +209,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public List<SegchkMsgWebResp> selectUserMsgList(SegchkUserWebReq segchkUserWebReq) {
logger.debug("selectUserMsgList with: {}", segchkUserWebReq.toString());
return segchkUserIndexMapper.selectUserMsgList(segchkUserWebReq);
}
@ -213,6 +221,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public List<SegchkServiceOrderWebReq> selectUserOrderPredCardListWebInfo(SegchkServiceOrderWebReq segchkServiceOrderWebReq) {
logger.debug("selectUserOrderPredCardListWebInfo with: {}", segchkServiceOrderWebReq.toString());
return segchkUserIndexMapper.selectUserOrderPredCardListWebInfo(segchkServiceOrderWebReq);
}
@ -224,12 +233,14 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public void CheckUserServiceChk(SegchkUserLikego segchkUserLikego) {
logger.debug("CheckUserServiceChk with: {}", segchkUserLikego.toString());
SegchkServiceOrderWebReq segchkServiceOrderWebReq = new SegchkServiceOrderWebReq();
segchkServiceOrderWebReq.setProviderId(segchkUserLikego.getProviderId());
segchkServiceOrderWebReq.setUserId(segchkUserLikego.getUserId());
segchkServiceOrderWebReq.setStoreId(segchkUserLikego.getStoreId());
List<SegchkServiceOrderWebReq> segchkServiceOrderWebReqList = segchkUserIndexMapper.selectUserOrderPredCardListWebInfo(segchkServiceOrderWebReq);
if(segchkServiceOrderWebReqList == null || segchkServiceOrderWebReqList.isEmpty()){
logger.warn("CheckUserServiceChk user has no card can use {}", segchkUserLikego.toString());
// 说明该用户已经没有可使用的卡了
}
else {
@ -240,6 +251,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
@Override
public SegchkServiceOrderChkTestResp selectUserOrderPredInfo(Long likegoId) {
logger.debug("selectUserOrderPredInfo with: {}", likegoId.toString());
return segchkUserIndexMapper.selectUserOrderPredInfo(likegoId);
}
@ -253,10 +265,12 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
@Override
@Transactional
public int OrderCheckTransaction(SegchkServiceOrderChkTestResp segchkServiceOrderChkTestResp, Long likegoId) {
logger.debug("OrderCheckTransaction with: {}---{}", segchkServiceOrderChkTestResp.toString(), likegoId);
int ret = 0;
if(segchkServiceOrderChkTestResp.getCardType() == 0){
// 说明是会员卡，则先更新会员卡次数。然后插入核消记录，最后更新预约订单状态
// SegchkUserVip segchkUserVip = new SegchkUserVip();
logger.debug("OrderCheckTransaction will check with vip card");
ret += segchkIndexUserVipMapper.updateSegchkUserVipCheck(segchkServiceOrderChkTestResp.getCardId());
System.out.println(ret);
SegchkServiceChk segchkServiceChk = new SegchkServiceChk(); segchkServiceChk.setCardId(segchkServiceOrderChkTestResp.getCardId());
@ -270,6 +284,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
}
else {
// 说明是优惠券或赠卡则先更新赠卡次数。然后插入核消记录，最后更新预约订单状态
logger.debug("OrderCheckTransaction will check with store card");
ret += segchkStoreSelfMgtMapper.updateSegchkUserVipCheck(segchkServiceOrderChkTestResp.getCardId());
System.out.println(ret);
SegchkSelfServiceChk segchkSelfServiceChk = new SegchkSelfServiceChk();
@ -283,6 +298,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
SegchkUserLikego segchkUserLikego = new SegchkUserLikego();
segchkUserLikego.setLikegoId(likegoId);
segchkUserLikego.setMgtState(2);
logger.debug("OrderCheckTransaction will update likego");
ret += segchkUserLikegoMapper.updateSegchkUserLikego(segchkUserLikego);
System.out.println(ret);
return ret;
@ -299,16 +315,17 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
@Transactional
public void chargeRet(String chargeId, int ret) {
// 根据回调结果。如果成功，则插入生成会员卡，并获取会员卡号，否则不产生新的会员卡号
logger.debug("chargeRet with: {}---{}", chargeId.toString(), ret);
if(ret == 0){
// 支付成功，生成新的会员卡信息
SegchkChargeRet segchkChargeRet = new SegchkChargeRet();
segchkChargeRet.setChargeId(Long.valueOf(chargeId));
int insert_ret = segchkIndexUserVipMapper.insertSegchkUserVipByCharge(segchkChargeRet);
if(insert_ret == 0){
System.out.format("生成新的会员卡失败--->{0}\n", segchkChargeRet.getChargeId());
logger.error("生成新的会员卡失败--->{0}\n", segchkChargeRet.getChargeId());
}
else{
System.out.format("生成新的会员卡成功--->{0}:{1}\n", chargeId, segchkChargeRet.getCardId());
logger.info("生成新的会员卡成功--->{0}:{1}\n", chargeId, segchkChargeRet.getCardId());
}
// 根据新生成的会员卡号，充值id，更新相应的充值记录表，商家赠卡表等
SegchkUserCharge segchkUserCharge = new SegchkUserCharge();
@ -336,12 +353,14 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public List<SegchkUserChargeCard> SegchkUserChargePre(SegchkUserWebReq segchkUserWebReq) {
logger.debug("SegchkUserChargePre with: {}", segchkUserWebReq.toString());
List<SegchkUserChargeCard> segchkUserChargeCards = segchkUserIndexMapper.selectSegchkUserChargePre(segchkUserWebReq);
// 说明该用户购买过正式会员卡
// boolean b = segchkUserChargeCards.parallelStream().anyMatch(v -> v.getHadBuy() != 0 && v.getCardTypeValue().compareTo(new BigDecimal(20.0)) = -1);
if(segchkUserChargeCards.parallelStream().anyMatch(v -> v.getCanBuy() == 1 || v.getCanBuy() == 3)){
// 如果有一张卡，为正在使用中1，则不可以再充值购买
logger.debug("SegchkUserChargePre user had one using card");
return null;
}
else{
@ -361,6 +380,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public BigDecimal getAccount(SegchkUserCharge segchkUserCharge) {
logger.debug("getAccount with: {}", segchkUserCharge.toString());
SegchkUserAccountCheck segchkUserAccountCheck = new SegchkUserAccountCheck();
segchkUserAccountCheck.setAccount(segchkUserCharge.getAccountUsed());
segchkUserAccountCheck.setProviderId(segchkUserCharge.getProviderId());
@ -378,6 +398,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public int getAccountForCash(SegchkUserCashOpsReq segchkUserCashOpsReq, String ip) {
logger.debug("getAccountForCash with: {}---{}", segchkUserCashOpsReq.toString(), ip);
SegchkUserCashOpsResp segchkUserCashOpsResp = segchkIndexUserAccountMapper.selectSegchkUserAccountForCash(segchkUserCashOpsReq);
if(segchkUserCashOpsResp == null){
// 说明用户没有任何余额信息
@ -417,6 +438,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
@Override
@Transactional
public void cashRet(String chargeId, int ret) {
logger.debug("cashRet with: {}---{}", chargeId.toString(), ret);
int opsRet = 0;
SegchkUserCash segchkUserCash = new SegchkUserCash();
segchkUserCash.setCashId(Long.valueOf(chargeId));
@ -436,6 +458,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
@Override
@Transactional
public int insertSegchkServiceComment(SegchkServiceCommentUserReq segchkServiceCommentUserReq) {
logger.debug("insertSegchkServiceComment with: {}", segchkServiceCommentUserReq.toString());
int ret = segchkServiceCommentMapper.insertSegchkServiceCommentByChk(segchkServiceCommentUserReq);
SegchkServiceChk segchkServiceChk = new SegchkServiceChk();
segchkServiceChk.setCommentId(segchkServiceCommentUserReq.getCommentId());
@ -452,6 +475,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public SegchkServiceComment selectSegchkServiceComment(SegchkServiceCommentUserReq segchkServiceCommentUserReq) {
logger.debug("selectSegchkServiceComment with: {}", segchkServiceCommentUserReq.toString());
return segchkServiceCommentMapper.selectSegchkServiceCommentByCommentId(segchkServiceCommentUserReq.getCommentId());
}
@ -463,6 +487,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public int updateUserInfo(SegchkUserSetInfoReq segchkUserSetInfoReq) {
logger.debug("updateUserInfo with: {}", segchkUserSetInfoReq.toString());
SegchkUserSecurity segchkUserSecurity = new SegchkUserSecurity();
segchkUserSecurity.setPasswd(segchkUserSetInfoReq.getPasswd());
segchkUserSecurity.setUserId(segchkUserSetInfoReq.getUserId());
@ -478,6 +503,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public int userCerticify(SegchkUserCertificationInfo segchkUserCertificationInfo) {
logger.debug("userCerticify with: {}", segchkUserCertificationInfo.toString());
SegchkUserCertificationInfo tmp = new SegchkUserCertificationInfo();
tmp.setUserId(segchkUserCertificationInfo.getUserId());
tmp.setProviderId(segchkUserCertificationInfo.getProviderId());
@ -499,6 +525,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public SegchkUserLevelInfo selectUserLevelByMobile(String phoneno) {
logger.debug("selectUserLevelByMobile with: {}", phoneno.toString());
return segchkUserIndexMapper.selectUserLevelByMobile(phoneno);
}
@ -510,6 +537,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public int addUserBasicInfo(SegchkUserBasicInfo segchkUserBasicInfo) {
logger.debug("addUserBasicInfo with: {}", segchkUserBasicInfo.toString());
return segchkUserBasicInfoMapper.insertSegchkUserBasicInfo(segchkUserBasicInfo);
}
@ -521,6 +549,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public int recommenderIsExit(Map<String, Object> parmMap) {
logger.debug("recommenderIsExit with: {}", parmMap.toString());
String userLevel = parmMap.get("userLevel").toString();
switch (userLevel){
case "0": return segchkUserIndexMapper.providerIsExit(parmMap);
@ -538,6 +567,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public int insertUserExtInfo(SegchkUserExtInfo segchkUserExtInfo) {
logger.debug("insertUserExtInfo with: {}", segchkUserExtInfo.toString());
return segchkUserExtInfoMapper.insertSegchkUserExtInfo(segchkUserExtInfo);
}
@ -549,6 +579,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public String getWeChatInfoByUserId(SegchkUserLevelInfo segchkUserLevelInfo) {
logger.debug("getWeChatInfoByUserId with: {}", segchkUserLevelInfo.toString());
if(segchkUserLevelInfo.getUserLevel() == 2) {
SegchkUserWechat segchkUserWechat = segchkUserWechatMapper.selectSegchkUserWechatByUserId(segchkUserLevelInfo.getUserId());
if(ObjectUtils.isEmpty(segchkUserWechat)
@ -575,6 +606,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
*/
@Override
public int updateWeChatInfoByUserId(SegchkUserWechat segchkUserWechat, String userLevel) {
logger.debug("updateWeChatInfoByUserId with: {}---{}", segchkUserWechat.toString(), userLevel);
switch (userLevel){
case "0": return segchkUserIndexMapper.updateSegchkProviderWechat(segchkUserWechat);
case "1": return segchkUserIndexMapper.updateSegchkStoreWechat(segchkUserWechat);
@ -586,6 +618,7 @@ public class SegchkUserIndexServiceImpl implements ISegchkUserIndexService
@Transactional
public int makeCashOps(SegchkUserCashOpsReq segchkUserCashOpsReq, String ip) {
logger.debug("makeCashOps with: {}", segchkUserCashOpsReq.toString());
int ret = 0;
int type = segchkUserCashOpsReq.getUserLevel();
String cashId = null;

5
ruoyi-segchk/src/main/java/com/ruoyi/util/CommonConstant.java
View File

@ -197,6 +197,11 @@ public interface CommonConstant {
*/
String APPLET_REGISTER_CODE_KEY = "APPLET_REGISTER_CODE_KEY";
/**
* 小程序端redis短信验证测试key
*/
String SMS_TEST_KEY = "APPLET_TEST_KEY";
/**
* 小程序端redis放置登录的key(注册登录)
*/

15
ruoyi-segchk/src/main/java/com/ruoyi/util/QRCodeUtils.java
View File

@ -5,6 +5,7 @@ import com.google.zxing.EncodeHintType;
import com.google.zxing.MultiFormatWriter;
import com.google.zxing.common.BitMatrix;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
@ -52,7 +53,7 @@ public final class QRCodeUtils {
height = 200;
}
outputStream = response.getOutputStream();
QRCodeUtils.createQrCode(url, width, height, "jpg", outputStream);
QRCodeUtils.createQrCode(url, width, height, "jpg", outputStream, null, null);
outputStream.flush();
} catch (Exception e) {
e.printStackTrace();
@ -74,15 +75,21 @@ public final class QRCodeUtils {
* @param width 宽
* @param height 高
*/
public static void createQrCode(String content, int width, int height, String format, OutputStream stream) throws Exception {
public static void createQrCode(String content, int width, int height, String format, OutputStream stream, String qrPath, String bgPath) throws Exception {
Hashtable<EncodeHintType, String> hints = new Hashtable<>();
hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
BitMatrix bitMatrix = new MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints);
BufferedImage bufferedImage = toBufferedImage(deleteWhite(bitMatrix));
BufferedImage poster = QRPostersUtil.drawImage2out(null, bufferedImage, "C:\\Users\\Public\\Desktop\\dome.jpg");
ImageIO.write(poster, format, stream);
if(!StringUtils.isEmpty(bgPath)) {
// 如果指定了海报路径。则说明是分享商家
BufferedImage poster = QRPostersUtil.drawImage2out(bgPath, bufferedImage, "C:\\Users\\Public\\Desktop\\dome.jpg");
ImageIO.write(poster, format, stream);
}
else{
ImageIO.write(bufferedImage, format, stream);
}
}
/**

2
ruoyi-segchk/src/main/java/com/ruoyi/util/WechatUtils.java
View File

@ -633,7 +633,7 @@ public class WechatUtils {
* @param xml 请求参数
* @return 返回数据
*/
private static String executeHttpPost(String url, String xml) {
public static String executeHttpPost(String url, String xml) {
logger.debug("executeHttpPost and url:{}", url);
String result = null;
BasicHttpClientConnectionManager connManager = new BasicHttpClientConnectionManager(

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

@ -544,4 +544,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectStoreOpenIdById" parameterType="long" resultMap="WeChatCustomerLinkResult">
select openid from segchk_store_basic_info where store_id = #{storeId}
</select>
<select id="isCollectByUser" parameterType="java.util.Map" resultType="java.lang.Integer">
select count(1) from segchk_user_collect where
provider_id = #{providerId}
and user_id = #{userId}
and store_id = #{storeId}
and mgt_state = 0
</select>
</mapper>

7
ruoyi-segchk/src/main/resources/mapper/setting/LsSmsSettingMapper.xml
View File

@ -16,10 +16,12 @@
<result property="auditTemplateId" column="audit_template_id"/>
<result property="settlementTemplateId" column="settlement_template_id"/>
<result property="withdrawTemplateId" column="withdraw_template_id"/>
<result property="withdrawTemplateId" column="withdraw_template_id"/>
<result property="status" column="status"/>
</resultMap>
<sql id="selectLsSmsSettingVo">
select id, secret, url, sign, template_id, writeoff_template_id, virtual_order_template_id, 'key', audit_template_id, settlement_template_id, withdraw_template_id from segchk_sms_setting
select id, secret, url, sign, template_id, writeoff_template_id, virtual_order_template_id, `key`, audit_template_id, settlement_template_id, withdraw_template_id, status from segchk_sms_setting
</sql>
<select id="selectLsSmsSettingList" parameterType="LsSmsSetting" resultMap="LsSmsSettingResult">
@ -44,6 +46,9 @@
<if test="withdrawTemplateId != null and withdrawTemplateId != ''">and withdraw_template_id =
#{withdrawTemplateId}
</if>
<if test="status != null and status != ''">and status =
#{status}
</if>
</where>
</select>

2
ruoyi-system/pom.xml
View File

@ -6,7 +6,7 @@
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.6.0</version>
<relativePath>../pom.xml</relativePath>
<!-- <relativePath>../pom.xml</relativePath>-->
</parent>
<modelVersion>4.0.0</modelVersion>

14
ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreBasicInfoWebResp.java
View File

@ -93,6 +93,11 @@ public class SegchkStoreBasicInfoWebResp extends BaseEntity
@Excel(name = "商户平均星评")
private BigDecimal starAvg;
/** 是否被收藏 */
@Excel(name = "是否被收藏")
private Integer isCollect = 0;
/** 商户标签列表 */
@Valid
private List<SegchkRecommenderStoreLableWeb> segchkRecommenderStoreLableWebList;
@ -270,6 +275,14 @@ public class SegchkStoreBasicInfoWebResp extends BaseEntity
this.starAvg = starAvg;
}
public Integer getIsCollect() {
return isCollect;
}
public void setIsCollect(Integer isCollect) {
this.isCollect = isCollect;
}
@Override
public String toString() {
return "SegchkStoreBasicInfoWebResp{" +
@ -292,6 +305,7 @@ public class SegchkStoreBasicInfoWebResp extends BaseEntity
", storeCarousel6='" + storeCarousel6 + '\'' +
", chkCount=" + chkCount +
", starAvg=" + starAvg +
", isCollect=" + isCollect +
", segchkRecommenderStoreLableWebList=" + segchkRecommenderStoreLableWebList +
'}';
}

12
ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkStoreWebReq.java
View File

@ -25,7 +25,7 @@ public class SegchkStoreWebReq extends BaseEntity
/** 商户id */
@Excel(name = "商户id")
private Integer storeId;
private Long storeId;
/** 商户名称 */
@Excel(name = "商户名称")
@ -45,7 +45,7 @@ public class SegchkStoreWebReq extends BaseEntity
/** 充值卡id */
@Excel(name = "充值卡id")
private Integer cardId;
private Long cardId;
/** 充值卡名称 */
@Excel(name = "充值卡名称")
@ -75,11 +75,11 @@ public class SegchkStoreWebReq extends BaseEntity
this.sortType = sortType;
}
public Integer getStoreId() {
public Long getStoreId() {
return storeId;
}
public void setStoreId(Integer storeId) {
public void setStoreId(Long storeId) {
this.storeId = storeId;
}
@ -115,11 +115,11 @@ public class SegchkStoreWebReq extends BaseEntity
this.typeId = typeId;
}
public Integer getCardId() {
public Long getCardId() {
return cardId;
}
public void setCardId(Integer cardId) {
public void setCardId(Long cardId) {
this.cardId = cardId;
}

6
ruoyi-system/src/main/java/com/ruoyi/segchk/domain/SegchkUserCollect.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.segchk.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@ -122,4 +123,9 @@ public class SegchkUserCollect extends BaseEntity
.append("mgtState", getMgtState())
.toString();
}
public boolean isValid() {
return ObjectUtils.isNotEmpty(this.providerId)
&& ObjectUtils.isNotEmpty(this.userId);
}
}

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

@ -1,242 +0,0 @@
package com.ruoyi.segchk.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.math.BigDecimal;
/**
* seg用户基本信息对象 segchk_user_basic_info
*
* @author yinzhiying
* @date 2021-07-01
*/
public class SegchkUserWebResp extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 运营商id，全局唯一 */
@Excel(name = "运营商id，全局唯一")
private Long providerId;
/** 用户id，全局唯一 */
@Excel(name = "用户id，全局唯一")
private Long userId;
/** 用户手机号 */
@Excel(name = "用户手机号")
private String phoneNo;
/** 用户名称 */
@Excel(name = "用户名称")
private String userName;
/** 微信唯一识别号 */
@Excel(name = "微信唯一识别号")
private String openid;
/** 用户头像 */
@Excel(name = "用户头像")
private String userIcon;
/** 是否实名认证 */
@Excel(name = "是否实名认证")
private Integer iscertified;
/** 账号余额 */
@Excel(name = "账号余额")
private BigDecimal account;
/** 核消次数 */
@Excel(name = "核消次数")
private Long chkCount;
/** 充值次数 */
@Excel(name = "充值次数")
private Long chargeCount;
/** 提现次数 */
@Excel(name = "提现次数")
private Long cashCount;
/** 未读消息数量 */
@Excel(name = "未读消息数量")
private Long msgCount;
/** 可用卡数量 */
@Excel(name = "可用卡数量")
private Long cardCount;
/** 优惠券数量 */
@Excel(name = "优惠券数量")
private Long storeCardCount;
/** 商家数量 */
@Excel(name = "商家数量")
private Long storeCount;
/** 有效预约单数量 */
@Excel(name = "预约单数量")
private Long likegoCount;
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public String getPhoneNo() {
return phoneNo;
}
public void setPhoneNo(String phoneNo) {
this.phoneNo = phoneNo;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getOpenid() {
return openid;
}
public void setOpenid(String openid) {
this.openid = openid;
}
public String getUserIcon() {
return userIcon;
}
public void setUserIcon(String userIcon) {
this.userIcon = userIcon;
}
public Integer getIscertified() {
return iscertified;
}
public void setIscertified(Integer iscertified) {
this.iscertified = iscertified;
}
public BigDecimal getAccount() {
return account;
}
public void setAccount(BigDecimal account) {
this.account = account;
}
public Long getChkCount() {
return chkCount;
}
public void setChkCount(Long chkCount) {
this.chkCount = chkCount;
}
public Long getChargeCount() {
return chargeCount;
}
public void setChargeCount(Long chargeCount) {
this.chargeCount = chargeCount;
}
public Long getCashCount() {
return cashCount;
}
public void setCashCount(Long cashCount) {
this.cashCount = cashCount;
}
public Long getMsgCount() {
return msgCount;
}
public void setMsgCount(Long msgCount) {
this.msgCount = msgCount;
}
public Long getCardCount() {
return cardCount;
}
public void setCardCount(Long cardCount) {
this.cardCount = cardCount;
}
public Long getStorecardCount() {
return storeCardCount;
}
public void setStorecardCount(Long storecardCount) {
this.storeCardCount = storecardCount;
}
public Long getProviderId() {
return providerId;
}
public void setProviderId(Long providerId) {
this.providerId = providerId;
}
@Override
public String toString() {
return "SegchkUserWebResp{" +
"providerId=" + providerId +
", userId=" + userId +
", phoneNo='" + phoneNo + '\'' +
", userName='" + userName + '\'' +
", openid='" + openid + '\'' +
", userIcon='" + userIcon + '\'' +
", iscertified=" + iscertified +
", account=" + account +
", chkCount=" + chkCount +
", chargeCount=" + chargeCount +
", cashCount=" + cashCount +
", msgCount=" + msgCount +
", cardCount=" + cardCount +
", storecardCount=" + storeCardCount +
", storeCount=" + storeCount +
", likegoCount=" + likegoCount +
'}';
}
public Long getStoreCardCount() {
return storeCardCount;
}
public void setStoreCardCount(Long storeCardCount) {
this.storeCardCount = storeCardCount;
}
public Long getStoreCount() {
return storeCount;
}
public void setStoreCount(Long storeCount) {
this.storeCount = storeCount;
}
public Long getLikegoCount() {
return likegoCount;
}
public void setLikegoCount(Long likegoCount) {
this.likegoCount = likegoCount;
}
}

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

@ -54,6 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="modTime != null">#{modTime},</if>
<if test="mgtState != null">#{mgtState},</if>
</trim>
ON DUPLICATE KEY UPDATE
mod_time = now()
, mgt_state = 0
</insert>
<update id="updateSegchkUserCollect" parameterType="SegchkUserCollect">