From ef8b3e55a7ea92fcb274d8c7c65ec5ae94dd46f7 Mon Sep 17 00:00:00 2001 From: taochengbo <552920369@qq.com> Date: Sat, 16 Jan 2021 22:22:56 +0800 Subject: [PATCH] =?UTF-8?q?springboot=E5=8D=87=E7=BA=A72.4.2,=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../co/yixiang/common/param/QueryParam.java | 8 ++++++++ .../co/yixiang/common/util/CityTreeUtil.java | 9 ++++++--- .../co/yixiang/common/util/RequestUtils.java | 5 +++++ .../activity/rest/StoreBargainController.java | 2 +- .../rest/StoreCombinationController.java | 2 +- .../activity/rest/StoreIntegralController.java | 2 +- .../activity/rest/StoreSeckillController.java | 2 +- .../modules/auth/rest/AuthController.java | 2 +- .../modules/cart/rest/StoreCartController.java | 2 +- .../modules/coupon/rest/CouponController.java | 2 +- .../modules/manage/rest/ShoperController.java | 2 +- .../order/rest/StoreOrderController.java | 2 +- .../product/rest/StoreCategoryController.java | 2 +- .../product/rest/StoreProductController.java | 17 +++++++++++------ .../services/CreatShareProductService.java | 7 ++++++- .../modules/services/OrderSupplyService.java | 1 + .../modules/shop/rest/ArticleController.java | 2 +- .../modules/shop/rest/IndexController.java | 4 ++-- .../user/rest/UserAddressController.java | 2 +- .../modules/user/rest/UserBillController.java | 2 +- .../modules/user/rest/UserController.java | 2 +- .../user/rest/UserExtractController.java | 2 +- .../modules/user/rest/UserLevelController.java | 2 +- .../user/rest/UserRechargeController.java | 2 +- .../rest/controller/WechatController.java | 2 +- .../rest/controller/WxMaUserController.java | 2 +- .../service/impl/YxStoreOrderServiceImpl.java | 1 + .../service/impl/YxStoreProductServiceImpl.java | 1 + .../template/service/dto/AppointInfoDto.java | 12 +++++++++--- .../impl/YxSystemUserTaskServiceImpl.java | 1 + .../user/service/impl/YxUserServiceImpl.java | 1 + .../rest/YxStoreCustomerController.java | 4 +++- .../order/rest/StoreOrderController.java | 6 ++++-- .../impl/VerificationCodeServiceImpl.java | 1 - .../modules/mp/config/WxPayConfiguration.java | 1 + 36 files changed, 81 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index e8008174..6c833ca0 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2 @@ -37,7 +37,7 @@ 1.8 2.9.0 2.9.2 - 1.2.74 + 1.2.75 1.1.10 5.2.5 2.5.0 diff --git a/yshop-app/src/main/java/co/yixiang/common/param/QueryParam.java b/yshop-app/src/main/java/co/yixiang/common/param/QueryParam.java index 401dc68e..34c55a87 100644 --- a/yshop-app/src/main/java/co/yixiang/common/param/QueryParam.java +++ b/yshop-app/src/main/java/co/yixiang/common/param/QueryParam.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/common/util/CityTreeUtil.java b/yshop-app/src/main/java/co/yixiang/common/util/CityTreeUtil.java index bca77971..9262188f 100644 --- a/yshop-app/src/main/java/co/yixiang/common/util/CityTreeUtil.java +++ b/yshop-app/src/main/java/co/yixiang/common/util/CityTreeUtil.java @@ -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 { } -} \ No newline at end of file +} diff --git a/yshop-app/src/main/java/co/yixiang/common/util/RequestUtils.java b/yshop-app/src/main/java/co/yixiang/common/util/RequestUtils.java index 87b03047..031657dd 100644 --- a/yshop-app/src/main/java/co/yixiang/common/util/RequestUtils.java +++ b/yshop-app/src/main/java/co/yixiang/common/util/RequestUtils.java @@ -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() { diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java index 250c2941..c2a247cd 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java @@ -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 { diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index ab0cf186..aa3c9951 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreIntegralController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreIntegralController.java index 85c96077..505967a5 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreIntegralController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreIntegralController.java @@ -22,7 +22,7 @@ import java.util.List; @Slf4j @RestController @RequestMapping -@Api(value = "积分兑换", tags = "营销:积分兑换", description = "积分兑换") +@Api(value = "积分兑换", tags = "营销:积分兑换") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreIntegralController { diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java index 19e80d02..03585e97 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java @@ -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 { diff --git a/yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java b/yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java index a49675ad..97b79d25 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java b/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java index f3af655a..e737fde9 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java @@ -42,7 +42,7 @@ import java.util.Map; */ @Slf4j @RestController -@Api(value = "购物车", tags = "商城:购物车", description = "购物车") +@Api(value = "购物车", tags = "商城:购物车") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreCartController { diff --git a/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java b/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java index eeb713ee..242cdd6d 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java @@ -48,7 +48,7 @@ import java.util.List; */ @Slf4j @RestController -@Api(value = "优惠券", tags = "营销:优惠券", description = "优惠券") +@Api(value = "优惠券", tags = "营销:优惠券") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class CouponController { diff --git a/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java b/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java index ff5f5023..170cdf63 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index 2bef7ac2..dd97e9a3 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreCategoryController.java b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreCategoryController.java index a51631b5..9f4cabc5 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreCategoryController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreCategoryController.java @@ -32,7 +32,7 @@ import java.util.List; */ @Slf4j @RestController -@Api(value = "商品分类", tags = "商城:商品分类", description = "商品分类") +@Api(value = "商品分类", tags = "商城:商品分类") @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class StoreCategoryController { diff --git a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index abaf185a..eb4d42cf 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -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> moreGoodsList(@PathVariable Integer type){ Map 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)); diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java b/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java index 3624acfd..f41cd103 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java @@ -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); diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java b/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java index b8f473a2..757fd0a4 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java @@ -244,6 +244,7 @@ public class OrderSupplyService { storeOrderService.integralPay(orderId,uid); map.put("payMsg","积分兑换成功"); return map; + default: } map.put("payMsg","订单生成失败"); diff --git a/yshop-app/src/main/java/co/yixiang/modules/shop/rest/ArticleController.java b/yshop-app/src/main/java/co/yixiang/modules/shop/rest/ArticleController.java index 312d72e0..605cca2a 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/shop/rest/ArticleController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/shop/rest/ArticleController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/shop/rest/IndexController.java b/yshop-app/src/main/java/co/yixiang/modules/shop/rest/IndexController.java index 356027bd..510e17d9 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/shop/rest/IndexController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/shop/rest/IndexController.java @@ -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); diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java index ead4fe7a..15cc9489 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java index c41ebc71..e72c4dce 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java index ee167317..c5eb4ee4 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java index 14510440..5f93724b 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserLevelController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserLevelController.java index 6245ac6a..faa51a88 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserLevelController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserLevelController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java index f3c41c79..95057379 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatController.java b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatController.java index 13632d98..a9fcadd4 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatController.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java index 76511929..fc8a7932 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java @@ -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; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 3d60fda0..e1b94226 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -1149,6 +1149,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl pageModel = new Page<>(page, limit); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java index 48dfc378..1c9f35f6 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java @@ -436,6 +436,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl pageModel = new Page<>(page, limit); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/AppointInfoDto.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/AppointInfoDto.java index 41f2a03c..55e2ea4d 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/AppointInfoDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/dto/AppointInfoDto.java @@ -14,9 +14,15 @@ import java.util.List; @Setter public class AppointInfoDto { - private String a_num; //包邮件数 - private String a_price; //包邮费用 - private List place; //包邮地区 + /** 包邮件数 */ + private String a_num; + + /** 包邮费用 */ + private String a_price; + + /** 包邮地区 */ + private List place; + private String placeName; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java index b6b2a6cb..b6f07811 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java @@ -161,6 +161,7 @@ public class YxSystemUserTaskServiceImpl extends BaseServiceImpl= taskQueryVo.getNumber()){ diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java index bf00b1d2..d7d3e4fc 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java @@ -541,6 +541,7 @@ public class YxUserServiceImpl extends BaseServiceImpl imple .round(NumberUtil.mul(order.getTotalPrice(),storeBrokerageTwo),2); //固定返佣 + 比例返佣 = 总返佣金额 return NumberUtil.add(twoBrokerage,storeBrokerageTwoPrice); + default: } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/customer/rest/YxStoreCustomerController.java b/yshop-shop/src/main/java/co/yixiang/modules/customer/rest/YxStoreCustomerController.java index ad169694..fa90e2e5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/customer/rest/YxStoreCustomerController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/customer/rest/YxStoreCustomerController.java @@ -63,7 +63,9 @@ public class YxStoreCustomerController { @PreAuthorize("@el.check('admin','yxStoreCustomer:add')") public ResponseEntity create(@Validated @RequestBody YxStoreCustomer resources){ int count = yxStoreCustomerService.count(new LambdaQueryWrapper().eq(YxStoreCustomer::getOpenId, resources.getOpenId())); - if (count > 0) throw new BadRequestException("当前用户已存在，请勿重复提交"); + if (count > 0) { + throw new BadRequestException("当前用户已存在，请勿重复提交"); + } return new ResponseEntity<>(yxStoreCustomerService.save(resources),HttpStatus.CREATED); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index bdf00b29..55936277 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -388,8 +388,8 @@ public class StoreOrderController { private YxStoreOrderQueryCriteria handleQuery(YxStoreOrderQueryCriteria criteria,String orderStatus, String orderType){ - - criteria.setShippingType(OrderInfoEnum.SHIPPIING_TYPE_1.getValue());//默认查询所有快递订单 + //默认查询所有快递订单 + criteria.setShippingType(OrderInfoEnum.SHIPPIING_TYPE_1.getValue()); //订单状态查询 if (StrUtil.isNotEmpty(orderStatus)) { switch (orderStatus) { @@ -426,6 +426,7 @@ public class StoreOrderController { criteria.setPaid(OrderInfoEnum.PAY_STATUS_1.getValue()); criteria.setRefundStatus(OrderInfoEnum.REFUND_STATUS_2.getValue()); break; + default: } } //订单类型查询 @@ -448,6 +449,7 @@ public class StoreOrderController { case "5": criteria.setShippingType(2); break; + default: } } diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java index 94d4c195..0002a864 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java @@ -25,7 +25,6 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.Collections; -import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxPayConfiguration.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxPayConfiguration.java index be8767df..ff34abba 100644 --- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxPayConfiguration.java +++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/config/WxPayConfiguration.java @@ -55,6 +55,7 @@ public class WxPayConfiguration { case APP: payConfig.setAppId(RedisUtil.get(ShopKeyUtils.getWxNativeAppAppId())); break; + default: } payConfig.setMchId(redisUtils.getY(ShopKeyUtils.getWxPayMchId()));