sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

宝象购修复

Browse Source
This commit is contained in:
Loki
2022-05-06 10:16:22 +08:00
parent a89a69b145
commit 4d3b8caf21
38 changed files with 290 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zsw-bxg/src/main/java/co/yixiang/api/ApiResult.java
-232
View File
@@ -1,232 +0,0 @@
/**
* Copyright (C) 2018-2022
* All rights reserved, Designed By www.yixiang.co
* 注意：
* 本软件为www.yixiang.co开发研制，未经购买不得使用
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.api;
import cn.iocoder.yudao.framework.common.exception.ApiCode;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.experimental.Accessors;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* API 返回结果
* @author hupeng
* @date 2020-04-30
*/
@Data
@Accessors(chain = true)
@Builder
@AllArgsConstructor
public class ApiResult<T> implements Serializable {
private static final long serialVersionUID = 8004487252556526569L;
/**
* 响应码
*/
@ApiModelProperty(value = "响应码")
private int status;
/**
* 是否成功
*/
@ApiModelProperty(value = "是否成功：成功true，失败false")
private boolean success;
/**
* 响应消息
*/
@ApiModelProperty(value = "响应消息")
private String msg;
/**
* 总条数
*/
@ApiModelProperty(value = "总条数")
private Integer total;
/**
* 总页数
*/
@ApiModelProperty(value = "总页数")
private Integer totalPage;
/**
* 响应数据
*/
@ApiModelProperty(value = "响应数据")
private T data;
/**
* 响应时间
*/
@ApiModelProperty(value = "响应时间")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date time;
public ApiResult() {
time = new Date();
}
public static ApiResult<Boolean> result(boolean flag){
if (flag){
return ok();
}
return fail();
}
public static ApiResult<Boolean> result(ApiCode apiCode){
return result(apiCode,null);
}
public static <T> ApiResult<T> result(ApiCode apiCode, T data){
return result(apiCode,null,data);
}
public static <T> ApiResult<T> resultPage(Integer total, Integer totalPage, T data){
return (ApiResult<T>) ApiResult.builder()
.total(total)
.totalPage(totalPage)
.status(200)
.msg(null)
.data(data)
.success(true)
.time(new Date())
.build();
}
public static <T> ApiResult<T> result(ApiCode apiCode, String message, T data){
boolean success = false;
if (apiCode.getCode() == ApiCode.SUCCESS.getCode()){
success = true;
}
if (StringUtils.isBlank(message)){
message = apiCode.getMessage();
}
return (ApiResult<T>) ApiResult.builder()
.status(apiCode.getCode())
.msg(message)
.data(data)
.success(success)
.time(new Date())
.build();
}
public static ApiResult<Boolean> ok(){
return ok(null);
}
public static <T> ApiResult<T> ok(T data){
return result(ApiCode.SUCCESS,data);
}
public static <T> ApiResult<T> ok(T data, String message){
return result(ApiCode.SUCCESS,message,data);
}
public static ApiResult<Map<String,Object>> okMap(String key, Object value){
Map<String,Object> map = new HashMap<>(1);
map.put(key,value);
return ok(map);
}
public static ApiResult<Boolean> fail(ApiCode apiCode){
return result(apiCode,null);
}
public static ApiResult<String> fail(String message){
return result(ApiCode.FAIL,message,null);
}
public static <T> ApiResult<T> fail(ApiCode apiCode, T data){
if (ApiCode.SUCCESS == apiCode){
throw new RuntimeException("失败结果状态码不能为" + ApiCode.SUCCESS.getCode());
}
return result(apiCode,data);
}
public static ApiResult<String> fail(Integer errorCode, String message){
return new ApiResult<String>()
.setSuccess(false)
.setStatus(errorCode)
.setMsg(message);
}
public static ApiResult<Map<String,Object>> fail(String key, Object value){
Map<String,Object> map = new HashMap<>(1);
map.put(key,value);
return result(ApiCode.FAIL,map);
}
public static <T> ApiResult<T> resultPage(T t, int limit){
List<Object> list = (List<Object>) t;
int count = list.size() / limit;
if (list.size() == 0) {
return (ApiResult<T>) ApiResult.builder()
.total(0)
.totalPage(0)
.status(200)
.msg(null)
.data(list)
.success(true)
.time(new Date())
.build();
}
if (list.size() <= limit) {
return (ApiResult<T>) ApiResult.builder()
.total(list.size())
.totalPage(1)
.status(200)
.msg(null)
.data(list)
.success(true)
.time(new Date())
.build();
} else if (count % limit == 0) {
return (ApiResult<T>) ApiResult.builder()
.total(list.size())
.totalPage(count)
.status(200)
.msg(null)
.data(list)
.success(true)
.time(new Date())
.build();
} else {
return (ApiResult<T>) ApiResult.builder()
.total(list.size())
.totalPage(count+1)
.status(200)
.msg(null)
.data(list)
.success(true)
.time(new Date())
.build();
}
}
public static ApiResult<Boolean> fail() {
return fail(ApiCode.FAIL);
}
}
zsw-bxg/src/main/java/co/yixiang/app/common/util/JwtToken.java
+3 -3
View File
@@ -36,12 +36,12 @@ public class JwtToken {
private static Integer expiredTimeIn;
private static Integer defaultScope = 8;
@Value("${yshop.security.jwt-key}")
@Value("${bxg.security.jwt-key}")
public void setJwtKey(String jwtKey) {
JwtToken.jwtKey = jwtKey;
}
@Value("${yshop.security.token-expired-in}")
@Value("${bxg.security.token-expired-in}")
public void setExpiredTimeIn(Integer expiredTimeIn) {
JwtToken.expiredTimeIn = expiredTimeIn;
}
@@ -99,7 +99,7 @@ public class JwtToken {
Map<String, Date> map = new HashMap<>();
Calendar calendar = Calendar.getInstance();
Date now = calendar.getTime();
calendar.add(Calendar.SECOND, JwtToken.expiredTimeIn);
calendar.add(Calendar.DATE, JwtToken.expiredTimeIn);
map.put("now", now);
map.put("expiredTime", calendar.getTime());
return map;
zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreBargainController.java
+1 -1
View File
@@ -11,7 +11,7 @@ package co.yixiang.app.modules.activity.rest;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.common.aop.NoRepeatSubmit;
import co.yixiang.app.common.bean.LocalUser;
zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreCombinationController.java
+1 -1
View File
@@ -10,7 +10,7 @@ package co.yixiang.app.modules.activity.rest;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.common.bean.LocalUser;
import co.yixiang.app.modules.activity.param.PinkCancelParam;
zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreSeckillController.java
+1 -1
View File
@@ -11,7 +11,7 @@ package co.yixiang.app.modules.activity.rest;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.logging.aop.log.AppLog;
import co.yixiang.app.common.bean.LocalUser;
zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/StoreIntegralController.java
+1 -1
View File
@@ -1,6 +1,6 @@
package co.yixiang.app.modules.activity.rest;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import co.yixiang.modules.product.param.YxStoreProductQueryParam;
import co.yixiang.modules.product.service.YxStoreProductService;
import co.yixiang.modules.product.vo.YxStoreProductQueryVo;
zsw-bxg/src/main/java/co/yixiang/app/modules/auth/rest/LetterAppAuthController.java
+1 -1
View File
@@ -12,7 +12,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.common.enums.SmsTypeEnum;
import co.yixiang.app.common.util.JwtToken;
zsw-bxg/src/main/java/co/yixiang/app/modules/cart/rest/StoreCartController.java
+1 -1
View File
@@ -9,7 +9,7 @@
package co.yixiang.app.modules.cart.rest;
import co.yixiang.annotation.Limit;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import co.yixiang.app.common.aop.NoRepeatSubmit;
import co.yixiang.app.common.bean.LocalUser;
import co.yixiang.app.modules.cart.param.CartIdsParm;
zsw-bxg/src/main/java/co/yixiang/app/modules/coupon/rest/CouponController.java
+2 -2
View File
@@ -9,7 +9,7 @@
package co.yixiang.app.modules.coupon.rest;
import cn.hutool.core.util.NumberUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.logging.aop.log.AppLog;
import co.yixiang.app.common.aop.NoRepeatSubmit;
@@ -87,7 +87,7 @@ public class CouponController {
public ApiResult<Boolean> receive(@Validated @RequestBody YxStoreCouponQueryParam param){
Long uid = LocalUser.getUser().getUid();
if(!NumberUtil.isNumber(param.getCouponId())){
throw new YshopException("参数非法");
throw new YshopException("参数错误哦");
}
Integer couponId = Integer.valueOf(param.getCouponId());
couponIssueService.issueUserCoupon(couponId,uid);
zsw-bxg/src/main/java/co/yixiang/app/modules/manage/rest/ShoperController.java
+1 -1
View File
@@ -10,7 +10,7 @@ package co.yixiang.app.modules.manage.rest;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.modules.order.param.OrderDeliveryParam;
import co.yixiang.app.modules.order.param.OrderRefundParam;
zsw-bxg/src/main/java/co/yixiang/app/modules/order/rest/AppStoreOrderController.java
+1 -9
View File
@@ -11,8 +11,7 @@ package co.yixiang.app.modules.order.rest;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.common.aop.NoRepeatSubmit;
import co.yixiang.app.common.bean.LocalUser;
@@ -21,7 +20,6 @@ import co.yixiang.app.modules.order.param.ExpressParam;
import co.yixiang.app.modules.services.CreatShareProductService;
import co.yixiang.app.modules.services.OrderSupplyService;
import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.enums.*;
import co.yixiang.logging.aop.log.AppLog;
import co.yixiang.modules.mp.domain.YxWechatTemplate;
@@ -39,7 +37,6 @@ import co.yixiang.modules.order.vo.ComputeVo;
import co.yixiang.modules.order.vo.ConfirmOrderVo;
import co.yixiang.modules.order.vo.OrderCartInfoVo;
import co.yixiang.modules.order.vo.YxStoreOrderQueryVo;
import co.yixiang.modules.shop.service.YxSystemConfigService;
import co.yixiang.modules.user.domain.YxUser;
import co.yixiang.tools.express.ExpressService;
import co.yixiang.tools.express.config.ExpressAutoConfiguration;
@@ -51,17 +48,12 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.imageio.ImageIO;
import javax.validation.Valid;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.LinkedHashMap;
zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreCategoryController.java
+1 -1
View File
@@ -9,7 +9,7 @@
package co.yixiang.app.modules.product.rest;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import co.yixiang.modules.category.service.YxStoreCategoryService;
import co.yixiang.utils.CateDTO;
import io.swagger.annotations.Api;
zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreProductController.java
+4 -12
View File
@@ -10,12 +10,9 @@ package co.yixiang.app.modules.product.rest;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.common.aop.NoRepeatSubmit;
import co.yixiang.app.common.bean.LocalUser;
@@ -38,7 +35,6 @@ import co.yixiang.modules.product.vo.ProductVo;
import co.yixiang.modules.product.vo.ReplyCountVo;
import co.yixiang.modules.product.vo.YxStoreProductQueryVo;
import co.yixiang.modules.product.vo.YxStoreProductReplyQueryVo;
import co.yixiang.modules.shop.domain.YxSystemAttachment;
import co.yixiang.modules.shop.service.YxSystemAttachmentService;
import co.yixiang.modules.shop.service.YxSystemConfigService;
import co.yixiang.modules.user.domain.YxUser;
@@ -50,14 +46,10 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.imageio.ImageIO;
import java.awt.FontFormatException;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.util.LinkedHashMap;
@@ -219,7 +211,7 @@ public class AppStoreProductController {
public ApiResult<Boolean> collectAdd(@Validated @RequestBody YxStoreProductRelationQueryParam param){
long uid = LocalUser.getUser().getUid();
if(!NumberUtil.isNumber(param.getId())) {
throw new YshopException("参数非法");
throw new YshopException("参数错误哦");
}
productRelationService.addRroductRelation(Long.valueOf(param.getId()),uid,param.getCategory());
return ApiResult.ok();
@@ -236,7 +228,7 @@ public class AppStoreProductController {
public ApiResult<Boolean> collectDel(@Validated @RequestBody YxStoreProductRelationQueryParam param){
long uid = LocalUser.getUser().getUid();
if(!NumberUtil.isNumber(param.getId())) {
throw new YshopException("参数非法");
throw new YshopException("参数错误哦");
}
productRelationService.delRroductRelation(Long.valueOf(param.getId()),
uid,param.getCategory());
@@ -253,7 +245,7 @@ public class AppStoreProductController {
@ApiOperation(value = "删除足跡",notes = "删除足跡")
public ApiResult<Boolean> collectDelFoot(@Validated @RequestBody CollectDelFootParam param){
if (CollectionUtil.isEmpty(param.getIds())){
throw new YshopException("参数非法");
throw new YshopException("参数错误哦");
}
productRelationService.collectDelFoot(param.getIds());
return ApiResult.ok();
zsw-bxg/src/main/java/co/yixiang/app/modules/services/AppAuthService.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class AppAuthService {
private static Integer expiredTimeIn;
private final YxSystemAttachmentService systemAttachmentService;
@Value("${yshop.security.token-expired-in}")
@Value("${bxg.security.token-expired-in}")
public void setExpiredTimeIn(Integer expiredTimeIn) {
AppAuthService.expiredTimeIn = expiredTimeIn;
}
zsw-bxg/src/main/java/co/yixiang/app/modules/shop/rest/ArticleController.java
+1 -2
View File
@@ -8,7 +8,7 @@
*/
package co.yixiang.app.modules.shop.rest;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import co.yixiang.modules.mp.service.YxArticleService;
import co.yixiang.modules.mp.vo.YxArticleQueryVo;
import io.swagger.annotations.Api;
@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Collections;
import java.util.List;
/**
zsw-bxg/src/main/java/co/yixiang/app/modules/shop/rest/IndexController.java
+1 -1
View File
@@ -10,7 +10,7 @@ package co.yixiang.app.modules.shop.rest;
import cn.hutool.core.io.file.FileReader;
import cn.hutool.core.io.resource.ClassPathResource;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.constant.ShopConstants;
import co.yixiang.enums.ProductEnum;
zsw-bxg/src/main/java/co/yixiang/app/rest/AppStoreAfterSalesController.java → zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppStoreAfterSalesController.java
+2 -2
View File
@@ -1,8 +1,8 @@
package co.yixiang.app.rest;
package co.yixiang.app.modules.user.rest;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.common.bean.LocalUser;
import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck;
zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserBillController.java
+1 -1
View File
@@ -10,7 +10,7 @@ package co.yixiang.app.modules.user.rest;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.common.bean.LocalUser;
import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck;
zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserExtractController.java
+1 -1
View File
@@ -9,7 +9,7 @@
package co.yixiang.app.modules.user.rest;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import co.yixiang.app.common.bean.LocalUser;
import co.yixiang.logging.aop.log.AppLog;
import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck;
zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserRechargeController.java
+1 -1
View File
@@ -9,7 +9,7 @@
package co.yixiang.app.modules.user.rest;
import cn.hutool.core.bean.BeanUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.common.bean.LocalUser;
import co.yixiang.app.modules.user.param.RechargeParam;
zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/LetterAppUserController.java
+1 -1
View File
@@ -9,7 +9,7 @@
package co.yixiang.app.modules.user.rest;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import co.yixiang.app.common.aop.NoRepeatSubmit;
import co.yixiang.app.common.bean.LocalUser;
import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck;
zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/UserAddressController.java
+2 -2
View File
@@ -10,7 +10,7 @@ package co.yixiang.app.modules.user.rest;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.common.bean.LocalUser;
import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck;
@@ -147,7 +147,7 @@ public class UserAddressController {
@ApiOperation(value = "地址详情",notes = "地址详情")
public ApiResult<YxUserAddressQueryVo> addressDetail(@PathVariable String id){
if(StrUtil.isBlank(id) || !NumberUtil.isNumber(id)){
throw new YshopException("参数非法");
throw new YshopException("参数错误哦");
}
return ApiResult.ok(userAddressService.getDetail(Long.valueOf(id)));
}
zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/UserLevelController.java
+2 -2
View File
@@ -11,7 +11,7 @@ package co.yixiang.app.modules.user.rest;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.common.bean.LocalUser;
import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck;
@@ -64,7 +64,7 @@ public class UserLevelController {
@ApiOperation(value = "获取等级任务",notes = "获取等级任务")
public ApiResult<Object> getTask(@PathVariable String id){
if(StrUtil.isBlank(id) || !NumberUtil.isNumber(id)){
throw new YshopException("参数非法");
throw new YshopException("参数错误哦");
}
Long uid = LocalUser.getUser().getUid();
return ApiResult.ok(systemUserTaskService.getTaskList(Integer.valueOf(id),uid));
zsw-bxg/src/main/java/co/yixiang/app/modules/wechat/rest/controller/WechatController.java
+1 -1
View File
@@ -10,7 +10,7 @@ package co.yixiang.app.modules.wechat.rest.controller;
import cn.binarywang.wx.miniapp.api.WxMaService;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import co.yixiang.constant.SystemConfigConstants;
import co.yixiang.enums.AfterSalesStatusEnum;
import co.yixiang.enums.BillDetailEnum;
zsw-bxg/src/main/java/co/yixiang/app/modules/wechat/rest/controller/WechatLiveController.java
+1 -1
View File
@@ -9,7 +9,7 @@
package co.yixiang.app.modules.wechat.rest.controller;
import cn.binarywang.wx.miniapp.bean.live.WxMaLiveResult;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import co.yixiang.modules.mp.service.YxWechatLiveService;
import co.yixiang.modules.mp.service.dto.YxWechatLiveQueryCriteria;
import co.yixiang.modules.mp.vo.WechatLiveVo;
zsw-bxg/src/main/java/co/yixiang/app/modules/wechat/rest/controller/WxMaUserController.java
+1 -1
View File
@@ -11,7 +11,7 @@ package co.yixiang.app.modules.wechat.rest.controller;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.ApiResult;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.app.common.bean.LocalUser;
import co.yixiang.app.modules.wechat.rest.param.BindPhoneParam;
zsw-bxg/src/main/java/co/yixiang/config/CachingConfigurer.java
+6
View File
@@ -1,5 +1,7 @@
package co.yixiang.config;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
@@ -24,6 +26,10 @@ public class CachingConfigurer extends CachingConfigurerSupport {
@Override
public KeyGenerator keyGenerator() {
return (target, method, params) -> {
Long tenantId = TenantContextHolder.getTenantId();
if (ObjectUtil.isNotEmpty(tenantId)){
return tenantId;
}
Map<String,Object> container = new HashMap<>(3);
Class<?> targetClassClass = target.getClass();
// 类地址
zsw-bxg/src/main/java/co/yixiang/config/StringKeyRedisSerializer.java
+2 -2
View File
@@ -33,7 +33,7 @@ public class StringKeyRedisSerializer implements RedisSerializer<Object> {
return null;
}
log.info("redis serialize:{}",string);
// log.info("redis serialize:{}",string);
string = string.replace("\"", "");
if (ObjectUtil.isNotEmpty(TenantContextHolder.getTenantId())){
string = StrUtil.format("{}_{}",TenantContextHolder.getTenantId().toString(),string);
@@ -44,7 +44,7 @@ public class StringKeyRedisSerializer implements RedisSerializer<Object> {
@Override
public Object deserialize(byte[] bytes) throws SerializationException {
String rs = (bytes == null ? null : new String(bytes));
log.info("redis deserialize:{}",rs);
// log.info("redis deserialize:{}",rs);
return rs;
}
}
zsw-bxg/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
+1 -4
View File
@@ -72,9 +72,6 @@ import java.util.stream.Collectors;
@SuppressWarnings("unchecked")
public class StoreOrderController {
@Value("${yshop.apiUrl}")
private String apiUrl;
private final IGenerator generator;
private final YxStoreOrderService yxStoreOrderService;
private final YxStoreOrderStatusService yxStoreOrderStatusService;
@@ -390,7 +387,7 @@ public class StoreOrderController {
String orderType){
//默认查询所有快递订单
criteria.setShippingType(OrderInfoEnum.SHIPPIING_TYPE_1.getValue());
// criteria.setShippingType(OrderInfoEnum.SHIPPIING_TYPE_1.getValue());
//订单状态查询
if (StrUtil.isNotEmpty(orderStatus)) {
switch (orderStatus) {
zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class YxUserRechargeServiceImpl extends BaseServiceImpl<UserRechargeMappe
@Override
public String addRecharge(YxUser user,String price,String paidPrice) {
if(StrUtil.isBlank(price) || StrUtil.isBlank(paidPrice)){
throw new YshopException("参数非法");
throw new YshopException("参数错误哦");
}
YxUserRecharge yxUserRecharge = new YxUserRecharge();