cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

springboot升级2.4.2,代码优化去掉无用代码

Browse Source
This commit is contained in:
taochengbo
2021-01-16 22:22:56 +08:00
parent e6a4dfdbd3
commit d792235784
36 changed files with 81 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yshop-app/src/main/java/co/yixiang/common/param/QueryParam.java
View File

@ -1,3 +1,11 @@
/**
* Copyright (C) 2018-2020
* All rights reserved, Designed By www.yixiang.co
* 注意：
* 本软件为www.yixiang.co开发研制，未经购买不得使用
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.common.param;

9
yshop-app/src/main/java/co/yixiang/common/util/CityTreeUtil.java
View File

@ -30,7 +30,8 @@ public class CityTreeUtil {
if (res.getPid() == parentId) {
//该节点为根节点,开始递归
recursionFn(list, res); //通过递归为节点设置childList
//通过递归为节点设置childList
recursionFn(list, res);
returnList.add(res);
}
@ -54,7 +55,9 @@ public class CityTreeUtil {
t.setC(childsList);
//迭代子集对象集
for (CityVo nextChild : childsList) { //遍历完,则退出递归
//遍历完,则退出递归
for (CityVo nextChild : childsList) {
//判断子集对象是否还有子节点
if (!CollectionUtils.isEmpty(childsList)) {
@ -84,4 +87,4 @@ public class CityTreeUtil {
}
}
}

5
yshop-app/src/main/java/co/yixiang/common/util/RequestUtils.java
View File

@ -5,6 +5,11 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* @ClassName 获取Request工具类
* @Author hupeng <610796224@qq.com>
* @Date 2020/6/26
**/
public class RequestUtils {
public static HttpServletRequest getRequest() {

2
yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java
View File

@ -68,7 +68,7 @@ import java.util.Map;
@RestController
@RequestMapping
@Api(value = "砍价商品", tags = "营销:砍价商品", description = "砍价商品")
@Api(value = "砍价商品", tags = "营销:砍价商品")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@SuppressWarnings("unchecked")
public class StoreBargainController {

2
yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java
View File

@ -59,7 +59,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "拼团", tags = "营销:拼团", description = "拼团")
@Api(value = "拼团", tags = "营销:拼团")
public class StoreCombinationController {
private final YxStoreCombinationService storeCombinationService;

2
yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreIntegralController.java
View File

@ -22,7 +22,7 @@ import java.util.List;
@Slf4j
@RestController
@RequestMapping
@Api(value = "积分兑换", tags = "营销:积分兑换", description = "积分兑换")
@Api(value = "积分兑换", tags = "营销:积分兑换")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class StoreIntegralController {

2
yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
View File

@ -57,7 +57,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@Slf4j
@RestController
@RequestMapping
@Api(value = "商品秒杀", tags = "营销:商品秒杀", description = "商品秒杀")
@Api(value = "商品秒杀", tags = "营销:商品秒杀")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class StoreSeckillController {

2
yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java
View File

@ -58,7 +58,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "认证模块", tags = "商城:认证", description = "认证")
@Api(value = "认证模块", tags = "商城:认证")
public class AuthController {
private final YxUserService userService;

2
yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java
View File

@ -42,7 +42,7 @@ import java.util.Map;
*/
@Slf4j
@RestController
@Api(value = "购物车", tags = "商城:购物车", description = "购物车")
@Api(value = "购物车", tags = "商城:购物车")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class StoreCartController {

2
yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java
View File

@ -48,7 +48,7 @@ import java.util.List;
*/
@Slf4j
@RestController
@Api(value = "优惠券", tags = "营销:优惠券", description = "优惠券")
@Api(value = "优惠券", tags = "营销:优惠券")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class CouponController {

2
yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java
View File

@ -52,7 +52,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "商家管理", tags = "商城:商家管理", description = "商家管理")
@Api(value = "商家管理", tags = "商城:商家管理")
public class ShoperController {
private final YxStoreOrderService storeOrderService;

2
yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
View File

@ -81,7 +81,7 @@ import java.util.stream.Collectors;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "订单模块", tags = "商城:订单模块", description = "订单模块")
@Api(value = "订单模块", tags = "商城:订单模块")
public class StoreOrderController {
private final YxStoreOrderService storeOrderService;

2
yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreCategoryController.java
View File

@ -32,7 +32,7 @@ import java.util.List;
*/
@Slf4j
@RestController
@Api(value = "商品分类", tags = "商城:商品分类", description = "商品分类")
@Api(value = "商品分类", tags = "商城:商品分类")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class StoreCategoryController {

17
yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
View File

@ -73,7 +73,7 @@ import java.util.Map;
*/
@Slf4j
@RestController
@Api(value = "产品模块", tags = "商城:产品模块", description = "产品模块")
@Api(value = "产品模块", tags = "商城:产品模块")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class StoreProductController {
@ -97,13 +97,17 @@ public class StoreProductController {
@ApiOperation(value = "获取首页更多产品",notes = "获取首页更多产品")
public ApiResult<Map<String,Object>> moreGoodsList(@PathVariable Integer type){
Map<String,Object> map = new LinkedHashMap<>();
if(ProductEnum.TYPE_1.getValue().equals(type)){// 精品推荐
// 精品推荐
if(ProductEnum.TYPE_1.getValue().equals(type)){
map.put("list",storeProductService.getList(1,20,ProductEnum.TYPE_1.getValue()));
}else if(type.equals(ProductEnum.TYPE_2.getValue())){// 热门榜单
// 热门榜单
}else if(type.equals(ProductEnum.TYPE_2.getValue())){
map.put("list",storeProductService.getList(1,20,ProductEnum.TYPE_2.getValue()));
}else if(type.equals(ProductEnum.TYPE_3.getValue())){// 首发新品
// 首发新品
}else if(type.equals(ProductEnum.TYPE_3.getValue())){
map.put("list",storeProductService.getList(1,20,ProductEnum.TYPE_3.getValue()));
}else if(type.equals(ProductEnum.TYPE_4.getValue())){// 促销单品
// 促销单品
}else if(type.equals(ProductEnum.TYPE_4.getValue())){
map.put("list",storeProductService.getList(1,20,ProductEnum.TYPE_4.getValue()));
}
@ -173,7 +177,8 @@ public class StoreProductController {
//生成二维码
QrCodeUtil.generate(siteUrl+"?id="+id+"&spread="+uid+"&pageType=good&codeType="+AppFromEnum.APP.getValue(), 180, 180,
FileUtil.file(fileDir+name));
}else if(AppFromEnum.H5.getValue().equals(from)){//如果类型是h5
//如果类型是h5
}else if(AppFromEnum.H5.getValue().equals(from)){
//生成二维码
QrCodeUtil.generate(siteUrl+"/detail/"+id+"?spread="+uid, 180, 180,
FileUtil.file(fileDir+name));

7
yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java
View File

@ -58,6 +58,11 @@ import java.net.URL;
import static co.yixiang.utils.FileUtil.transformStyle;
/**
* @ClassName 二维码相关服务
* @Author hupeng <610796224@qq.com>
* @Date 2020/6/22
**/
@Slf4j
@Service
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@ -780,7 +785,7 @@ public class CreatShareProductService {
//价格背景
//读取互联网图片
BufferedImage bground = null;//
BufferedImage bground = null;
InputStream redStream = getClass().getClassLoader().getResourceAsStream("red.jpg");
try {
ImageInputStream red = ImageIO.createImageInputStream(redStream);

1
yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java
View File

@ -244,6 +244,7 @@ public class OrderSupplyService {
storeOrderService.integralPay(orderId,uid);
map.put("payMsg","积分兑换成功");
return map;
default:
}
map.put("payMsg","订单生成失败");

2
yshop-app/src/main/java/co/yixiang/modules/shop/rest/ArticleController.java
View File

@ -36,7 +36,7 @@ import java.util.List;
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@RequestMapping("/article")
@Api(value = "文章模块", tags = "商城:文章模块", description = "文章模块")
@Api(value = "文章模块", tags = "商城:文章模块")
public class ArticleController {
private final YxArticleService articleService;

4
yshop-app/src/main/java/co/yixiang/modules/shop/rest/IndexController.java
View File

@ -57,7 +57,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "首页模块", tags = "商城:首页模块", description = "首页模块")
@Api(value = "首页模块", tags = "商城:首页模块")
public class IndexController {
private final YxAppVersionService appVersionService;
private final YxSystemGroupDataService systemGroupDataService;
@ -148,7 +148,7 @@ public class IndexController {
appVersionVo.setVersionCode(appVersion.getVersionCode());
appVersionVo.setVersionInfo(appVersion.getVersionInfo());
appVersionVo.setVersionName(appVersion.getVersionName());
appVersionVo.setDownloadUrl(param.getType().equals("1101")?appVersion.getAndroidUrl():appVersion.getIosUrl());
appVersionVo.setDownloadUrl("1101".equals(param.getType())?appVersion.getAndroidUrl():appVersion.getIosUrl());
appVersionVo.setForceUpdate(appVersion.getForceUpdate()==0);
if (!param.getVersionName().equals(appVersion.getVersionName())){
return ApiResult.ok(appVersionVo);

2
yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java
View File

@ -54,7 +54,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "用户地址", tags = "用户:用户地址", description = "用户地址")
@Api(value = "用户地址", tags = "用户:用户地址")
public class UserAddressController {
private final YxUserAddressService userAddressService;

2
yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java
View File

@ -56,7 +56,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "用户分销", tags = "用户:用户分销", description = "用户分销")
@Api(value = "用户分销", tags = "用户:用户分销")
public class UserBillController {
private final YxUserBillService userBillService;

2
yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java
View File

@ -61,7 +61,7 @@ import static co.yixiang.constant.SystemConfigConstants.YSHOP_SHOW_RECHARGE;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "用户中心", tags = "用户:用户中心", description = "用户中心")
@Api(value = "用户中心", tags = "用户:用户中心")
public class UserController {
private final YxUserService yxUserService;

2
yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java
View File

@ -43,7 +43,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "用户提现", tags = "用户:用户提现", description = "用户提现")
@Api(value = "用户提现", tags = "用户:用户提现")
public class UserExtractController {
private final YxUserExtractService userExtractService;

2
yshop-app/src/main/java/co/yixiang/modules/user/rest/UserLevelController.java
View File

@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "用户等级", tags = "用户:用户等级", description = "用户等级")
@Api(value = "用户等级", tags = "用户:用户等级")
public class UserLevelController {
private final YxUserLevelService userLevelService;

2
yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java
View File

@ -58,7 +58,7 @@ import java.util.stream.Collectors;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "用户充值", tags = "用户:用户充值", description = "用户充值")
@Api(value = "用户充值", tags = "用户:用户充值")
public class UserRechargeController {
private final YxUserRechargeService userRechargeService;

2
yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatController.java
View File

@ -63,7 +63,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "微信模块", tags = "微信:微信模块", description = "微信模块")
@Api(value = "微信模块", tags = "微信:微信模块")
public class WechatController {
private final YxStoreOrderService orderService;

2
yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java
View File

@ -45,7 +45,7 @@ import java.util.Map;
*/
@RestController
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api(value = "微信其他", tags = "微信:微信其他", description = "微信其他")
@Api(value = "微信其他", tags = "微信:微信其他")
public class WxMaUserController {
private final YxUserService userService;