diff --git a/pom.xml b/pom.xml index f49d439c..7e297489 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 2.9.0 1.16 2.9.2 - 1.2.70 + 1.2.73 1.1.10 5.2.5 2.5.0 diff --git a/yshop-admin/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java index 902f7121..a6b06b5e 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java @@ -46,7 +46,9 @@ public class RedisServiceImpl implements RedisService { continue; } DataType dataType = redisTemplate.type(s.toString()); - if(!dataType.code().equals("string")) continue; + if(!"string".equals(dataType.code())) { + continue; + } RedisVo redisVo = new RedisVo(s.toString(),redisTemplate.opsForValue().get(s.toString()).toString()); redisVos.add(redisVo); } diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java index 8b334c79..5a28d573 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java @@ -133,7 +133,7 @@ public class DeptServiceImpl extends BaseServiceImpl implement if(isChild) { depts.add(deptDto); for (Dept dept : deptList) { - if(dept.getId() == deptDto.getPid() && !deptNames.contains(dept.getName())){ + if(dept.getId().equals(deptDto.getPid()) && !deptNames.contains(dept.getName())){ depts.add(deptDto); } } diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java index b92f1d07..e5d62f3a 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java @@ -72,7 +72,7 @@ public class JobServiceImpl extends BaseServiceImpl implements J //断权限范围 for (Long deptId : criteria.getDeptIds()) { for (Job job : jobList) { - if(deptId ==job.getDeptId()){ + if(deptId.equals(job.getDeptId())){ job.setDept(deptService.getById(job.getDeptId())); } } diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java index 03c3a204..bea87810 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java @@ -315,7 +315,9 @@ public class MenuServiceImpl extends BaseServiceImpl implement if(StringUtils.isNotBlank(resources.getComponentName())&&resources.getType()!=0){ int menuCount = this.lambdaQuery().eq(Menu::getComponentName,resources.getComponentName()).count(); - if(menuCount > 1) throw new YshopException("请保持菜单组件名称唯一"); + if(menuCount > 1) { + throw new YshopException("请保持菜单组件名称唯一"); + } menu1 = this.getOne(new QueryWrapper().lambda() .eq(Menu::getComponentName,resources.getComponentName())); if(menu1 != null && !menu1.getId().equals(menu.getId())){ diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java index fb7be677..c3883d5d 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java @@ -144,7 +144,9 @@ public class SysUserServiceImpl extends BaseServiceImpl imp public UserDto findByName(String userName) { User user = userMapper.findByName(userName); - if(user == null) throw new YshopException("当前用户不存在"); + if(user == null) { + throw new YshopException("当前用户不存在"); + } //用户所属岗位 user.setJob(jobService.getById(user.getJobId())); //用户所属部门 diff --git a/yshop-app/src/main/java/co/yixiang/common/handler/GlobalExceptionHandler.java b/yshop-app/src/main/java/co/yixiang/common/handler/GlobalExceptionHandler.java index 48769caf..5fbeace8 100644 --- a/yshop-app/src/main/java/co/yixiang/common/handler/GlobalExceptionHandler.java +++ b/yshop-app/src/main/java/co/yixiang/common/handler/GlobalExceptionHandler.java @@ -62,7 +62,9 @@ public class GlobalExceptionHandler { Collections.sort(list); String msg = "不能为空"; - if(!list.isEmpty()) msg = list.get(0); + if(!list.isEmpty()) { + msg = list.get(0); + } log.error(getApiCodeString(ApiCode.PARAMETER_EXCEPTION) + ":" + JSON.toJSONString(list)); return ApiResult.fail(ApiCode.PARAMETER_EXCEPTION.getCode(), msg); } diff --git a/yshop-app/src/main/java/co/yixiang/common/interceptor/PermissionInterceptor.java b/yshop-app/src/main/java/co/yixiang/common/interceptor/PermissionInterceptor.java index 9524d84b..aee1930e 100644 --- a/yshop-app/src/main/java/co/yixiang/common/interceptor/PermissionInterceptor.java +++ b/yshop-app/src/main/java/co/yixiang/common/interceptor/PermissionInterceptor.java @@ -88,7 +88,9 @@ public class PermissionInterceptor extends HandlerInterceptorAdapter { Integer uid = map.get("uid").asInt(); Integer scope = map.get("scope").asInt(); YxUser user = userService.getById(uid); - if(user == null) throw new UnAuthenticatedException(ApiCode.NOT_PERMISSION); + if(user == null) { + throw new UnAuthenticatedException(ApiCode.NOT_PERMISSION); + } LocalUser.set(user, scope); } diff --git a/yshop-app/src/main/java/co/yixiang/common/util/JacksonUtil.java b/yshop-app/src/main/java/co/yixiang/common/util/JacksonUtil.java index 982f3317..7bcae517 100644 --- a/yshop-app/src/main/java/co/yixiang/common/util/JacksonUtil.java +++ b/yshop-app/src/main/java/co/yixiang/common/util/JacksonUtil.java @@ -26,8 +26,9 @@ public class JacksonUtil { try { node = mapper.readTree(body); JsonNode leaf = node.get(field); - if (leaf != null) + if (leaf != null) { return leaf.asText(); + } } catch (IOException e) { logger.error(e.getMessage(), e); } @@ -42,9 +43,10 @@ public class JacksonUtil { node = mapper.readTree(body); JsonNode leaf = node.get(field); - if (leaf != null) + if (leaf != null) { return mapper.convertValue(leaf, new TypeReference>() { }); + } } catch (IOException e) { logger.error(e.getMessage(), e); } @@ -57,8 +59,9 @@ public class JacksonUtil { try { node = mapper.readTree(body); JsonNode leaf = node.get(field); - if (leaf != null) + if (leaf != null) { return leaf.asInt(); + } } catch (IOException e) { logger.error(e.getMessage(), e); } @@ -72,9 +75,10 @@ public class JacksonUtil { node = mapper.readTree(body); JsonNode leaf = node.get(field); - if (leaf != null) + if (leaf != null) { return mapper.convertValue(leaf, new TypeReference>() { }); + } } catch (IOException e) { logger.error(e.getMessage(), e); } @@ -88,8 +92,9 @@ public class JacksonUtil { try { node = mapper.readTree(body); JsonNode leaf = node.get(field); - if (leaf != null) + if (leaf != null) { return leaf.asBoolean(); + } } catch (IOException e) { logger.error(e.getMessage(), e); } diff --git a/yshop-app/src/main/java/co/yixiang/common/util/SmsUtils.java b/yshop-app/src/main/java/co/yixiang/common/util/SmsUtils.java index b56b1ca1..bc67807e 100644 --- a/yshop-app/src/main/java/co/yixiang/common/util/SmsUtils.java +++ b/yshop-app/src/main/java/co/yixiang/common/util/SmsUtils.java @@ -34,7 +34,7 @@ public class SmsUtils { @Autowired public SmsUtils(RedisUtils redisUtils){ - this.redisUtils = redisUtils; + SmsUtils.redisUtils = redisUtils; } /** * 发送短信 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 0aea5733..db52c6b4 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 @@ -106,7 +106,9 @@ public class StoreBargainController { @GetMapping("/bargain/detail/{id}") @ApiOperation(value = "砍价详情",notes = "砍价详情",response = YxStoreBargainQueryVo.class) public ApiResult getYxStoreBargain(@PathVariable Long id){ - if(ObjectUtil.isNull(id)) throw new YshopException("参数错误"); + if(ObjectUtil.isNull(id)) { + throw new YshopException("参数错误"); + } YxUser yxUser = LocalUser.getUser(); return ApiResult.ok(storeBargainService.getDetail(id,yxUser)); } @@ -270,7 +272,9 @@ public class StoreBargainController { Long uid = LocalUser.getUser().getUid(); List yxStoreBargainUserQueryVos = storeBargainUserService .bargainUserList(uid,page,limit); - if(yxStoreBargainUserQueryVos.isEmpty()) throw new YshopException("暂无参与砍价"); + if(yxStoreBargainUserQueryVos.isEmpty()) { + throw new YshopException("暂无参与砍价"); + } return ApiResult.ok(yxStoreBargainUserQueryVos); } 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 e8745625..9670d3ca 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 @@ -91,7 +91,9 @@ public class StoreCombinationController { @GetMapping("/combination/detail/{id}") @ApiOperation(value = "拼团产品详情",notes = "拼团产品详情") public ApiResult detail(@PathVariable Long id){ - if(ObjectUtil.isNull(id)) throw new YshopException("参数错误"); + if(ObjectUtil.isNull(id)) { + throw new YshopException("参数错误"); + } Long uid = LocalUser.getUser().getUid(); StoreCombinationVo storeCombinationVo = storeCombinationService.getDetail(id,uid); storeCombinationVo.setUserCollect(relationService @@ -106,7 +108,9 @@ public class StoreCombinationController { @GetMapping("/combination/pink/{id}") @ApiOperation(value = "拼团明细",notes = "拼团明细") public ApiResult pink(@PathVariable Long id){ - if(ObjectUtil.isNull(id)) throw new YshopException("参数错误"); + if(ObjectUtil.isNull(id)) { + throw new YshopException("参数错误"); + } Long uid = LocalUser.getUser().getUid(); return ApiResult.ok(storePinkService.pinkInfo(id,uid)); } 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 f73921ff..da57e339 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 @@ -118,7 +118,7 @@ public class StoreSeckillController { SimpleDateFormat sdf = new SimpleDateFormat("HH"); String nowTime = sdf.format(new Date()); String index = nowTime.substring(0, 1); - int currentHour = index.equals("0") ? Integer.valueOf(nowTime.substring(1, 2)) : Integer.valueOf(nowTime); + int currentHour = "0".equals(index) ? Integer.valueOf(nowTime.substring(1, 2)) : Integer.valueOf(nowTime); SeckillTimeDto seckillTimeDto = new SeckillTimeDto(); seckillTimeDto.setId(i.getId()); //活动结束时间 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 663f6dab..a49675ad 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 @@ -143,7 +143,9 @@ public class AuthController { .eq(YxUser::getUsername,loginDTO.getUsername()) .eq(YxUser::getPassword,SecureUtil.md5(loginDTO.getPassword())),false); - if(yxUser == null) throw new YshopException("账号或者密码不正确"); + if(yxUser == null) { + throw new YshopException("账号或者密码不正确"); + } String token = JwtToken.makeToken(yxUser.getUid()); String expiresTimeStr = JwtToken.getExpireTime(token); 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 2294c61d..9abb7251 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 @@ -106,7 +106,9 @@ public class ShoperController { @GetMapping("/admin/order/detail/{key}") @ApiOperation(value = "订单详情",notes = "订单详情") public ApiResult orderDetail(@PathVariable String key){ - if(StrUtil.isEmpty(key)) throw new YshopException("参数错误"); + if(StrUtil.isEmpty(key)) { + throw new YshopException("参数错误"); + } YxStoreOrderQueryVo storeOrder = storeOrderService.getOrderInfo(key,null); if(ObjectUtil.isNull(storeOrder)){ throw new YshopException("订单不存在"); 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 41e8252d..e2a13884 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 @@ -155,7 +155,9 @@ public class StoreOrderController { //创建订单 YxStoreOrder order = storeOrderService.createOrder(yxUser,key,param); - if(ObjectUtil.isNull(order)) throw new YshopException("订单生成失败"); + if(ObjectUtil.isNull(order)) { + throw new YshopException("订单生成失败"); + } String orderId = order.getOrderId(); @@ -190,7 +192,9 @@ public class StoreOrderController { Long uid = LocalUser.getUser().getUid(); YxStoreOrderQueryVo storeOrder = storeOrderService .getOrderInfo(param.getUni(),uid); - if(ObjectUtil.isNull(storeOrder)) throw new YshopException("订单不存在"); + if(ObjectUtil.isNull(storeOrder)) { + throw new YshopException("订单不存在"); + } if(OrderInfoEnum.REFUND_STATUS_1.getValue().equals(storeOrder.getPaid())) { throw new YshopException("该订单已支付"); @@ -245,7 +249,9 @@ public class StoreOrderController { @ApiOperation(value = "订单详情",notes = "订单详情") public ApiResult detail(@PathVariable String key){ Long uid = LocalUser.getUser().getUid(); - if(StrUtil.isEmpty(key)) throw new YshopException("参数错误"); + if(StrUtil.isEmpty(key)) { + throw new YshopException("参数错误"); + } YxStoreOrderQueryVo storeOrder = storeOrderService.getOrderInfo(key,uid); if(ObjectUtil.isNull(storeOrder)){ throw new YshopException("订单不存在"); @@ -363,7 +369,9 @@ public class StoreOrderController { ExpressService expressService = ExpressAutoConfiguration.expressService(); ExpressInfo expressInfo = expressService.getExpressInfo(expressInfoDo.getOrderCode(), expressInfoDo.getShipperCode(), expressInfoDo.getLogisticCode()); - if(!expressInfo.isSuccess()) throw new YshopException(expressInfo.getReason()); + if(!expressInfo.isSuccess()) { + throw new YshopException(expressInfo.getReason()); + } return ApiResult.ok(expressInfo); } @@ -378,7 +386,9 @@ public class StoreOrderController { Long uid = LocalUser.getUser().getUid(); YxStoreOrderQueryVo orderQueryVo = storeOrderService.verificOrder(param.getVerifyCode(), param.getIsConfirm(),uid); - if(orderQueryVo != null) return ApiResult.ok(orderQueryVo); + if(orderQueryVo != null) { + return ApiResult.ok(orderQueryVo); + } return ApiResult.ok("核销成功"); } 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 78958ac5..6d859dbd 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 @@ -225,7 +225,9 @@ public class StoreProductController { @ApiOperation(value = "添加收藏",notes = "添加收藏") public ApiResult collectAdd(@Validated @RequestBody YxStoreProductRelationQueryParam param){ long uid = LocalUser.getUser().getUid(); - if(!NumberUtil.isNumber(param.getId())) throw new YshopException("参数非法"); + if(!NumberUtil.isNumber(param.getId())) { + throw new YshopException("参数非法"); + } productRelationService.addRroductRelation(Long.valueOf(param.getId()),uid); return ApiResult.ok(); } @@ -239,7 +241,9 @@ public class StoreProductController { @ApiOperation(value = "取消收藏",notes = "取消收藏") public ApiResult collectDel(@Validated @RequestBody YxStoreProductRelationQueryParam param){ long uid = LocalUser.getUser().getUid(); - if(!NumberUtil.isNumber(param.getId())) throw new YshopException("参数非法"); + if(!NumberUtil.isNumber(param.getId())) { + throw new YshopException("参数非法"); + } productRelationService.delRroductRelation(Long.valueOf(param.getId()), uid); return ApiResult.ok(); 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 55a690e5..b8b1dcfd 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 @@ -79,7 +79,9 @@ public class CreatShareProductService { //门店 if(OrderInfoEnum.SHIPPIING_TYPE_2.getValue().equals(storeOrder.getShippingType())){ String mapKey = RedisUtil.get(SystemConfigConstants.TENGXUN_MAP_KEY); - if(StrUtil.isBlank(mapKey)) throw new YshopException("请配置腾讯地图key"); + if(StrUtil.isBlank(mapKey)) { + throw new YshopException("请配置腾讯地图key"); + } String apiUrl = systemConfigService.getData(SystemConfigConstants.API_URL); if(StrUtil.isEmpty(apiUrl)){ throw new YshopException("未配置api地址"); @@ -463,9 +465,13 @@ public class CreatShareProductService { String apiUrl,String path){ Long uid = userInfo.getUid(); YxStorePink storePink = storePinkService.getById(pinkId); - if(ObjectUtil.isNull(storePink)) throw new YshopException("拼团不存在"); + if(ObjectUtil.isNull(storePink)) { + throw new YshopException("拼团不存在"); + } YxStoreCombination storeCombination = storeCombinationService.getById(storePink.getCid()); - if(ObjectUtil.isNull(storeCombination)) throw new YshopException("拼团产品不存在"); + if(ObjectUtil.isNull(storeCombination)) { + throw new YshopException("拼团产品不存在"); + } String userType = userInfo.getUserType(); if(StrUtil.isBlank(userType)) { 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 7f8ee270..f02e9c4a 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 @@ -105,7 +105,9 @@ public class OrderSupplyService { */ public Map check(Long uid,String key, ComputeOrderParam param){ Map map = Maps.newHashMap(); - if(StrUtil.isBlank(key)) throw new YshopException("参数错误"); + if(StrUtil.isBlank(key)) { + throw new YshopException("参数错误"); + } YxStoreOrderQueryVo storeOrder = storeOrderService.getOrderInfo(key,uid); if(ObjectUtil.isNotNull(storeOrder)){ @@ -124,7 +126,9 @@ public class OrderSupplyService { if(bargainId > 0){ YxStoreBargainUser storeBargainUser = storeBargainUserService .getBargainUserInfo(bargainId,uid); - if(storeBargainUser == null) throw new YshopException("砍价失败"); + if(storeBargainUser == null) { + throw new YshopException("砍价失败"); + } if(OrderInfoEnum.BARGAIN_STATUS_3.getValue().equals(storeBargainUser.getStatus())) { throw new YshopException("砍价已支付"); } 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 5e949cd7..0d5a3537 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 @@ -176,7 +176,9 @@ public class UserBillController { @RequestParam(value = "limit",defaultValue = "10") int limit, @PathVariable String type){ int newType = 0; - if(NumberUtil.isNumber(type)) newType = Integer.valueOf(type); + if(NumberUtil.isNumber(type)) { + newType = Integer.valueOf(type); + } Long uid = LocalUser.getUser().getUid(); return ApiResult.ok(userBillService.getUserBillList(page,limit,uid,newType)); } 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 5accae7f..40ccce64 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 @@ -98,7 +98,9 @@ public class UserRechargeController { Map map = new LinkedHashMap<>(); map.put("type",param.getFrom()); YxSystemGroupData systemGroupData = systemGroupDataService.getById(param.getRecharId()); - if(systemGroupData == null) throw new YshopException("充值方案不存在"); + if(systemGroupData == null) { + throw new YshopException("充值方案不存在"); + } JSONObject jsonObject = JSON.parseObject(systemGroupData.getValue()); String price = jsonObject.getString("price"); 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 63d7b1ef..04d80001 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 @@ -134,14 +134,20 @@ public class WechatController { public String renotify(@RequestBody String xmlData) { try { WxPayService wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.WECHAT); - if(wxPayService == null) wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.WXAPP); - if(wxPayService == null) wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.APP); + if(wxPayService == null) { + wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.WXAPP); + } + if(wxPayService == null) { + wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.APP); + } WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData); String orderId = notifyResult.getOutTradeNo(); String attach = notifyResult.getAttach(); if(BillDetailEnum.TYPE_3.getValue().equals(attach)){ YxStoreOrderQueryVo orderInfo = orderService.getOrderInfo(orderId,null); - if(orderInfo == null) return WxPayNotifyResponse.success("处理成功!"); + if(orderInfo == null) { + return WxPayNotifyResponse.success("处理成功!"); + } if(OrderInfoEnum.PAY_STATUS_1.getValue().equals(orderInfo.getPaid())){ return WxPayNotifyResponse.success("处理成功!"); } @@ -149,7 +155,9 @@ public class WechatController { }else if(BillDetailEnum.TYPE_1.getValue().equals(attach)){ //处理充值 YxUserRecharge userRecharge = userRechargeService.getInfoByOrderId(orderId); - if(userRecharge == null) return WxPayNotifyResponse.success("处理成功!"); + if(userRecharge == null) { + return WxPayNotifyResponse.success("处理成功!"); + } if(OrderInfoEnum.PAY_STATUS_1.getValue().equals(userRecharge.getPaid())){ return WxPayNotifyResponse.success("处理成功!"); } @@ -173,8 +181,12 @@ public class WechatController { public String parseRefundNotifyResult(@RequestBody String xmlData) { try { WxPayService wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.WECHAT); - if(wxPayService == null) wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.WXAPP); - if(wxPayService == null) wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.APP); + if(wxPayService == null) { + wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.WXAPP); + } + if(wxPayService == null) { + wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.APP); + } WxPayRefundNotifyResult result = wxPayService.parseRefundNotifyResult(xmlData); String orderId = result.getReqInfo().getOutTradeNo(); BigDecimal refundFee = BigNum.div(result.getReqInfo().getRefundFee(), 100); @@ -242,14 +254,18 @@ public class WechatController { // 明文传输的消息 WxMpXmlMessage inMessage = WxMpXmlMessage.fromXml(requestBody); WxMpXmlOutMessage outMessage = this.route(inMessage); - if(outMessage == null) return; + if(outMessage == null) { + return; + } out = outMessage.toXml();; } else if ("aes".equalsIgnoreCase(encType)) { // aes加密的消息 WxMpXmlMessage inMessage = WxMpXmlMessage.fromEncryptedXml(requestBody, wxService.getWxMpConfigStorage(), timestamp, nonce, msgSignature); WxMpXmlOutMessage outMessage = this.route(inMessage); - if(outMessage == null) return; + if(outMessage == null) { + return; + } out = outMessage.toEncryptedXml(wxService.getWxMpConfigStorage()); } diff --git a/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java index ec13f290..6d060b64 100644 --- a/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java +++ b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java @@ -169,5 +169,7 @@ public interface ShopConstants { String YSHOP_APP_LOGIN_USER = "app-online-token"; + String YSHOP_WECHAT_PUSH_REMARK = "yshop为您服务！"; + } diff --git a/yshop-common/src/main/java/co/yixiang/print/PrintUtil4.java b/yshop-common/src/main/java/co/yixiang/print/PrintUtil4.java index c33249c5..821c4e1d 100644 --- a/yshop-common/src/main/java/co/yixiang/print/PrintUtil4.java +++ b/yshop-common/src/main/java/co/yixiang/print/PrintUtil4.java @@ -569,8 +569,9 @@ public class PrintUtil4 { * @return */ public static String substring(String str, int f, int t) { - if (f > str.length()) + if (f > str.length()) { return null; + } if (t > str.length()) { return str.substring(f, str.length()); } else { diff --git a/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java b/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java index 8a68bb90..aae72b59 100644 --- a/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java +++ b/yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java @@ -27,7 +27,7 @@ public class OrderUtil { * @return **/ public static int getSecondTimestamp(){ - String timestamp = String.valueOf(new Date().getTime()/1000); + String timestamp = String.valueOf(System.currentTimeMillis()/1000); return Integer.valueOf(timestamp); } @@ -42,7 +42,9 @@ public class OrderUtil { public static String checkActivityStatus(Date starTime,Date endTime,Integer status){ Date nowTime = new Date(); - if(ShopCommonEnum.IS_STATUS_0.getValue().equals(status)) return "关闭"; + if(ShopCommonEnum.IS_STATUS_0.getValue().equals(status)) { + return "关闭"; + } if(DateUtil.compare(starTime,nowTime) > 0){ return "活动未开始"; @@ -131,7 +133,7 @@ public class OrderUtil { * @return **/ public static int getSecondTimestampTwo() { - String timestamp = String.valueOf(new Date().getTime() / 1000); + String timestamp = String.valueOf(System.currentTimeMillis() / 1000); return Integer.valueOf(timestamp); } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java index 8837e87a..1eafc99c 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java @@ -96,7 +96,9 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl surplusPrice) random = surplusPrice; + if(random > surplusPrice) { + random = surplusPrice; + } } @@ -174,7 +180,9 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl 0) userBargainStatus = false; + if(helpCount > 0) { + userBargainStatus = false; + } int count = storeBargainUserHelpService @@ -268,7 +278,9 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl 0) return; + if(price > 0) { + return; + } storeBargainUser.setStatus(3); @@ -85,7 +91,9 @@ public class YxStoreBargainUserServiceImpl extends BaseServiceImpl 0) throw new YshopException("已领取过该优惠劵"); + if(count > 0) { + throw new YshopException("已领取过该优惠劵"); + } if(couponIssueQueryVo.getRemainCount() <= 0 && CouponEnum.PERMANENT_0.getValue().equals(couponIssueQueryVo.getIsPermanent())){ @@ -100,7 +104,9 @@ public class YxStoreCouponIssueServiceImpl extends BaseServiceImpl getCouponList(int page, int limit, Long uid,Long productId,Integer type) { Page pageModel = new Page<>(page, limit); - if(type == null) type = CouponEnum.TYPE_0.getValue(); + if(type == null) { + type = CouponEnum.TYPE_0.getValue(); + } List list = yxStoreCouponIssueMapper .selecCoupontList(pageModel,type,productId); for (YxStoreCouponIssueQueryVo couponIssue : list) { diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java index f37f3c3f..ecff3d81 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java @@ -179,7 +179,7 @@ public class YxStoreCouponUserServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxStoreCouponUser::getUid,uid)); List storeCouponUserQueryVoList = new ArrayList<>(); - long nowTime = new Date().getTime(); + long nowTime = System.currentTimeMillis(); for (YxStoreCouponUser couponUser : storeCouponUsers) { YxStoreCouponUserQueryVo queryVo = generator.convert(couponUser,YxStoreCouponUserQueryVo.class); if(couponUser.getIsFail() == 1){ @@ -212,7 +212,9 @@ public class YxStoreCouponUserServiceImpl extends BaseServiceImpl list1,List list2){ - if(list2.isEmpty()) return true; + if(list2.isEmpty()) { + return true; + } list1 = new ArrayList<>(list1); list2 = new ArrayList<>(list2); list1.addAll(list2); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java index 658652c0..00bca533 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java @@ -104,7 +104,9 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl pinkAll = pinkUserDto.getPinkAll(); @@ -156,6 +158,7 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl listT = new ArrayList<>(); if(pink.getKId() > 0){ //团长存在 @@ -178,7 +181,9 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl uidAll = pinkUserDto.getUidAll(); int count = pinkUserDto.getCount(); - if(count < 0) count = 0; + if(count < 0) { + count = 0; + } if(OrderInfoEnum.PINK_STATUS_2.getValue().equals(pinkT.getStatus())){ pinkBool = PinkEnum.PINK_BOOL_1.getValue(); isOk = PinkEnum.IS_OK_1.getValue(); @@ -213,14 +220,20 @@ public class YxStorePinkServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxStorePink::getOrderId,order.getOrderId())); - if(pinkCount > 0) return; + if(pinkCount > 0) { + return; + } if(storeCombination != null){ YxStorePink storePink = YxStorePink.builder() .uid(order.getUid()) @@ -285,7 +300,9 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl 0){ //其他成员入团 - if(this.getIsPinkUid(order.getPinkId(),order.getUid())) return; + if(this.getIsPinkUid(order.getPinkId(),order.getUid())) { + return; + } storePink.setKId(order.getPinkId()); storePink.setStopTime(null); this.save(storePink); @@ -434,7 +451,9 @@ public class YxStorePinkServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxStorePink::getKId,id).eq(YxStorePink::getUid,uid)); - if(pink == null) return ""; + if(pink == null) { + return ""; + } } return pink.getOrderId(); } @@ -471,7 +490,9 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl carts = yxStoreCartMapper.selectList(wrapper); List valid = new ArrayList<>(); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java index 1f3562a7..f3a27649 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/category/service/impl/YxStoreCategoryServiceImpl.java @@ -130,10 +130,11 @@ public class YxStoreCategoryServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxStoreCategory::getId,pid)); - if(yxStoreCategory.getPid() > 0) return false; + if(yxStoreCategory.getPid() > 0) { + return false; + } return true; } @@ -174,11 +179,14 @@ public class YxStoreCategoryServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxStoreCategory::getId,id)); - if(yxStoreCategory.getPid() == 0) return false; + if(yxStoreCategory.getPid() == 0) { + return false; + } return true; } 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 875ed0cb..f820713d 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 @@ -289,7 +289,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl 0){ throw new YshopException("不满足优惠劵的使用条件"); @@ -401,7 +405,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl 0){ @@ -588,12 +602,16 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxStoreOrderCartInfo::getUnique,unique)); - if(ObjectUtil.isEmpty(orderCartInfo)) throw new YshopException("评价产品不存在"); + if(ObjectUtil.isEmpty(orderCartInfo)) { + throw new YshopException("评价产品不存在"); + } int count = productReplyService.count(Wrappers.lambdaQuery() .eq(YxStoreProductReply::getOid,orderCartInfo.getOid()) .eq(YxStoreProductReply::getProductId,orderCartInfo.getProductId())); - if(count > 0) throw new YshopException("该产品已评价"); + if(count > 0) { + throw new YshopException("该产品已评价"); + } YxStoreProductReply storeProductReply = YxStoreProductReply.builder() @@ -634,16 +652,22 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl0 ){ @@ -759,10 +787,14 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl 0 && order.getPinkId() != null && order.getPinkId() > 0){ @@ -950,7 +994,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperOne = new QueryWrapper<>(); - if(uid != null) wrapperOne.lambda().eq(YxStoreOrder::getUid,uid); + if(uid != null) { + wrapperOne.lambda().eq(YxStoreOrder::getUid,uid); + } wrapperOne.lambda().eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue()) .eq(YxStoreOrder::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue()); Integer orderCount = yxStoreOrderMapper.selectCount(wrapperOne); @@ -1184,7 +1234,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperTwo = new QueryWrapper<>(); - if(uid != null) wrapperTwo.lambda().eq(YxStoreOrder::getUid,uid); + if(uid != null) { + wrapperTwo.lambda().eq(YxStoreOrder::getUid,uid); + } wrapperTwo.lambda().eq(YxStoreOrder::getPaid, OrderInfoEnum.PAY_STATUS_0.getValue()) .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue()) .eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_0.getValue()); @@ -1192,7 +1244,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperThree = new QueryWrapper<>(); - if(uid != null) wrapperThree.lambda().eq(YxStoreOrder::getUid,uid); + if(uid != null) { + wrapperThree.lambda().eq(YxStoreOrder::getUid,uid); + } wrapperThree.lambda().eq(YxStoreOrder::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue()) .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue()) .eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_0.getValue()); @@ -1200,7 +1254,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperFour = new QueryWrapper<>(); - if(uid != null) wrapperFour.lambda().eq(YxStoreOrder::getUid,uid); + if(uid != null) { + wrapperFour.lambda().eq(YxStoreOrder::getUid,uid); + } wrapperFour.lambda().eq(YxStoreOrder::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue()) .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue()) .eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_1.getValue()); @@ -1208,7 +1264,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperFive = new QueryWrapper<>(); - if(uid != null) wrapperFive.lambda().eq(YxStoreOrder::getUid,uid); + if(uid != null) { + wrapperFive.lambda().eq(YxStoreOrder::getUid,uid); + } wrapperFive.lambda().eq(YxStoreOrder::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue()) .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue()) .eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_2.getValue()); @@ -1216,7 +1274,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperSix= new QueryWrapper<>(); - if(uid != null) wrapperSix.lambda().eq(YxStoreOrder::getUid,uid); + if(uid != null) { + wrapperSix.lambda().eq(YxStoreOrder::getUid,uid); + } wrapperSix.lambda().eq(YxStoreOrder::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue()) .eq(YxStoreOrder::getRefundStatus,OrderInfoEnum.REFUND_STATUS_0.getValue()) .eq(YxStoreOrder::getStatus,OrderInfoEnum.STATUS_3.getValue()); @@ -1224,7 +1284,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperSeven= new QueryWrapper<>(); - if(uid != null) wrapperSeven.lambda().eq(YxStoreOrder::getUid,uid); + if(uid != null) { + wrapperSeven.lambda().eq(YxStoreOrder::getUid,uid); + } String[] strArr = {"1","2"}; wrapperSeven.lambda().eq(YxStoreOrder::getPaid, OrderInfoEnum.PAY_STATUS_1.getValue()) .in(YxStoreOrder::getRefundStatus,Arrays.asList(strArr)); @@ -1364,7 +1426,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl 0) pinkService.createPink(orderInfo); + if(orderInfo.getCombinationId() > 0) { + pinkService.createPink(orderInfo); + } //砍价 if(orderInfo.getBargainId() > 0) { @@ -1374,7 +1438,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpli.eq(YxStoreOrder::getOrderId,unique).or().eq(YxStoreOrder::getUnique,unique).or() .eq(YxStoreOrder::getExtendOrderId,unique)); - if(uid != null) wrapper.lambda().eq(YxStoreOrder::getUid,uid); + if(uid != null) { + wrapper.lambda().eq(YxStoreOrder::getUid,uid); + } return generator.convert(yxStoreOrderMapper.selectOne(wrapper),YxStoreOrderQueryVo.class); } @@ -1506,7 +1586,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl cartInfo){ BigDecimal gainIntegral = BigDecimal.ZERO; for (YxStoreCartQueryVo cart : cartInfo) { - if(cart.getCombinationId() >0 || cart.getSeckillId() > 0 || cart.getBargainId() > 0) continue; + if(cart.getCombinationId() >0 || cart.getSeckillId() > 0 || cart.getBargainId() > 0) { + continue; + } BigDecimal cartInfoGainIntegral = BigDecimal.ZERO; Double gain = cart.getProductInfo().getGiveIntegral().doubleValue(); if(gain > 0){ @@ -1614,7 +1696,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl cartInfo,YxUserAddress userAddress){ BigDecimal storePostage = BigDecimal.ZERO; if(userAddress != null){ - if(userAddress.getCityId() == null) return storePostage; + if(userAddress.getCityId() == null) { + return storePostage; + } //城市包括默认 int cityId = userAddress.getCityId(); List citys = new ArrayList<>(); @@ -1782,7 +1870,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl 0) templateDTOMap.remove(mapKey); + if(count > 0) { + templateDTOMap.remove(mapKey); + } } //处理区域邮费 @@ -1892,16 +1984,16 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl cartInfo, String key) { BigDecimal sumPrice = BigDecimal.ZERO; - if(key.equals("truePrice")){ + if("truePrice".equals(key)){ for (YxStoreCartQueryVo storeCart : cartInfo) { sumPrice = NumberUtil.add(sumPrice,NumberUtil.mul(storeCart.getCartNum(),storeCart.getTruePrice())); } - }else if(key.equals("costPrice")){ + }else if("costPrice".equals(key)){ for (YxStoreCartQueryVo storeCart : cartInfo) { sumPrice = NumberUtil.add(sumPrice, NumberUtil.mul(storeCart.getCartNum(),storeCart.getCostPrice())); } - }else if(key.equals("vipTruePrice")){ + }else if("vipTruePrice".equals(key)){ for (YxStoreCartQueryVo storeCart : cartInfo) { sumPrice = NumberUtil.add(sumPrice, NumberUtil.mul(storeCart.getCartNum(),storeCart.getVipTruePrice())); @@ -2195,7 +2287,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxStoreProductAttr::getProductId,productId)); @@ -180,7 +182,9 @@ public class YxStoreProductAttrServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxStoreProductRelation::getUid,uid) .eq(YxStoreProductRelation::getProductId,productId)); - if(count > 0) return true; + if(count > 0) { + return true; + } return false; } 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 b5863e15..668e9c99 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 @@ -151,7 +151,9 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl { - if(i == null || i.isEmpty()) throw new YshopException("请至少添加一个规格值哦"); + if(i == null || i.isEmpty()) { + throw new YshopException("请至少添加一个规格值哦"); + } String str = ArrayUtil.join(i.toArray(),","); - if(str.contains("-")) throw new YshopException("规格值里包含'-',请重新添加"); + if(str.contains("-")) { + throw new YshopException("规格值里包含'-',请重新添加"); + } }); if(fromatDetailDTOList.size() > 1){ for (int i=0; i < fromatDetailDTOList.size() - 1;i++){ - if(i == 0) data = fromatDetailDTOList.get(i).getDetail(); + if(i == 0) { + data = fromatDetailDTOList.get(i).getDetail(); + } List tmp = new LinkedList<>(); for (String v : data) { for (String g : fromatDetailDTOList.get(i+1).getDetail()) { diff --git a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java index 1efca13d..3897fcc2 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java @@ -55,12 +55,16 @@ public class YxSystemConfigServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.lambda().eq(YxSystemConfig::getMenuName,name); YxSystemConfig systemConfig = this.baseMapper.selectOne(wrapper); - if(systemConfig == null) return ""; + if(systemConfig == null) { + return ""; + } return systemConfig.getValue(); } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java index 079253ad..06e5344d 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java @@ -94,9 +94,13 @@ public class YxSystemStoreServiceImpl extends BaseServiceImpl 0; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java index 3c9e9527..712276c4 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java @@ -179,7 +179,9 @@ public class YxShippingTemplatesServiceImpl extends BaseServiceImpl list = this.getLevelListAndGrade(levelId); - if(list.isEmpty()) throw new YshopException("请后台设置会员等级"); + if(list.isEmpty()) { + throw new YshopException("请后台设置会员等级"); + } //任务列表 TaskDto taskDTO = systemUserTaskService.getTaskList(list.get(0).getId(),uid); @@ -138,7 +144,9 @@ public class YxSystemUserLevelServiceImpl extends BaseServiceImpl newList = generator.convert(list,YxSystemUserLevelQueryVo.class); for (YxSystemUserLevelQueryVo userLevelQueryVo : newList) { - if(userLevelQueryVo.getId().compareTo(levelId) == 0) grade = userLevelQueryVo.getGrade(); + if(userLevelQueryVo.getId().compareTo(levelId) == 0) { + grade = userLevelQueryVo.getGrade(); + } if(grade.compareTo(userLevelQueryVo.getGrade()) < 0){ userLevelQueryVo.setIsClear(true); //不解锁 }else{ 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 5db92804..881615bd 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 @@ -94,7 +94,9 @@ public class YxSystemUserTaskServiceImpl extends BaseServiceImpl taskIds = list.stream().map(YxSystemUserTask::getId) .collect(Collectors.toList()); - if(taskIds.isEmpty()) return 0; + if(taskIds.isEmpty()) { + return 0; + } int count = yxUserTaskFinishMapper.selectCount(Wrappers.lambdaQuery() .in(YxUserTaskFinish::getTaskId,taskIds) @@ -192,7 +194,9 @@ public class YxSystemUserTaskServiceImpl extends BaseServiceImpl systemUserTaskDTOS = generator.convert(page.getList(),YxSystemUserTaskDto.class); for (YxSystemUserTaskDto systemUserTaskDTO : systemUserTaskDTOS) { YxSystemUserLevel userLevel=systemUserLevelService.getById(systemUserTaskDTO.getLevelId()); - if(userLevel == null) continue; + if(userLevel == null) { + continue; + } systemUserTaskDTO.setLevalName(userLevel.getName()); } Map map = new LinkedHashMap<>(2); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java index 430f388e..a8a7692d 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java @@ -72,7 +72,8 @@ public class YxUserAddressServiceImpl extends BaseServiceImpl userLevel.getValidTime()){ if(ShopCommonEnum.IS_STATUS_1.getValue().equals(userLevel.getStatus())){ @@ -119,7 +127,9 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl imple .collect(Collectors.toList()); List list = new ArrayList<>(); - if (userIds.isEmpty()) return list; + if (userIds.isEmpty()) { + return list; + } - if (StrUtil.isBlank(sort)) sort = "u.uid desc"; + if (StrUtil.isBlank(sort)) { + sort = "u.uid desc"; + } Page pageModel = new Page<>(page, limit); if (ShopCommonEnum.GRADE_0.getValue().equals(grade)) {//-级 @@ -181,7 +185,9 @@ public class YxUserServiceImpl extends BaseServiceImpl imple List userIdsT = userListT.stream() .map(YxUser::getUid) .collect(Collectors.toList()); - if (userIdsT.isEmpty()) return list; + if (userIdsT.isEmpty()) { + return list; + } list = yxUserMapper.getUserSpreadCountList(pageModel, userIdsT, keyword, sort); @@ -224,14 +230,18 @@ public class YxUserServiceImpl extends BaseServiceImpl imple public void backOrderBrokerage(YxStoreOrderQueryVo order) { //如果分销没开启直接返回 String open = systemConfigService.getData(SystemConfigConstants.STORE_BROKERAGE_OPEN); - if(StrUtil.isBlank(open) || ShopCommonEnum.ENABLE_2.getValue().toString().equals(open)) return; + if(StrUtil.isBlank(open) || ShopCommonEnum.ENABLE_2.getValue().toString().equals(open)) { + return; + } //获取购买商品的用户 YxUser userInfo = this.getById(order.getUid()); System.out.println("userInfo:"+userInfo); //当前用户不存在 没有上级 直接返回 - if(ObjectUtil.isNull(userInfo) || userInfo.getSpreadUid() == 0) return; + if(ObjectUtil.isNull(userInfo) || userInfo.getSpreadUid() == 0) { + return; + } YxUser preUser = this.getById(userInfo.getSpreadUid()); @@ -241,7 +251,9 @@ public class YxUserServiceImpl extends BaseServiceImpl imple //返佣金额小于等于0 直接返回不返佣金 - if(brokeragePrice.compareTo(BigDecimal.ZERO) <= 0) return; + if(brokeragePrice.compareTo(BigDecimal.ZERO) <= 0) { + return; + } //计算上级推广员返佣之后的金额 double balance = NumberUtil.add(preUser.getBrokeragePrice(),brokeragePrice).doubleValue(); @@ -351,9 +363,13 @@ public class YxUserServiceImpl extends BaseServiceImpl imple .last("limit 1"); YxUserLevel userLevel = userLevelService.getOne(wrapper); YxSystemUserLevel systemUserLevel = new YxSystemUserLevel(); - if(ObjectUtil.isNotNull(userLevel)) systemUserLevel= systemUserLevelService.getById(userLevel.getLevelId()); + if(ObjectUtil.isNotNull(userLevel)) { + systemUserLevel= systemUserLevelService.getById(userLevel.getLevelId()); + } int discount = 100; - if(ObjectUtil.isNotNull(userLevel)) discount = systemUserLevel.getDiscount().intValue(); + if(ObjectUtil.isNotNull(userLevel)) { + discount = systemUserLevel.getDiscount().intValue(); + } return NumberUtil.mul(NumberUtil.div(discount,100),price); } @@ -365,27 +381,43 @@ public class YxUserServiceImpl extends BaseServiceImpl imple */ @Override public void setSpread(String spread, long uid) { - if(StrUtil.isBlank(spread) || !NumberUtil.isNumber(spread)) return; + if(StrUtil.isBlank(spread) || !NumberUtil.isNumber(spread)) { + return; + } //如果分销没开启直接返回 String open = systemConfigService.getData(SystemConfigConstants.STORE_BROKERAGE_OPEN); - if(StrUtil.isBlank(open) || ShopCommonEnum.ENABLE_2.getValue().toString().equals(open)) return; + if(StrUtil.isBlank(open) || ShopCommonEnum.ENABLE_2.getValue().toString().equals(open)) { + return; + } //当前用户信息 YxUser userInfo = this.getById(uid); - if(ObjectUtil.isNull(userInfo)) return; + if(ObjectUtil.isNull(userInfo)) { + return; + } //当前用户有上级直接返回 - if(userInfo.getSpreadUid() != null && userInfo.getSpreadUid() > 0) return; + if(userInfo.getSpreadUid() != null && userInfo.getSpreadUid() > 0) { + return; + } //没有推广编号直接返回 long spreadInt = Long.valueOf(spread); - if(spreadInt == 0) return; - if(spreadInt == uid) return; + if(spreadInt == 0) { + return; + } + if(spreadInt == uid) { + return; + } //不能互相成为上下级 YxUser userInfoT = this.getById(spreadInt); - if(ObjectUtil.isNull(userInfoT)) return; + if(ObjectUtil.isNull(userInfoT)) { + return; + } - if(userInfoT.getSpreadUid() == uid) return; + if(userInfoT.getSpreadUid() == uid) { + return; + } YxUser yxUser = YxUser.builder() .spreadUid(spreadInt) @@ -410,7 +442,9 @@ public class YxUserServiceImpl extends BaseServiceImpl imple YxUser userInfoTwo = this.getById(userInfo.getSpreadUid()); //上推广人不存在 或者 上推广人没有上级 直接返回 - if(ObjectUtil.isNull(userInfoTwo) || userInfoTwo.getSpreadUid() == 0) return; + if(ObjectUtil.isNull(userInfoTwo) || userInfoTwo.getSpreadUid() == 0) { + return; + } //指定分销 判断 上上级是否时推广员 如果不是推广员直接返回 @@ -421,7 +455,9 @@ public class YxUserServiceImpl extends BaseServiceImpl imple BigDecimal brokeragePrice = this.computeProductBrokerage(order,Brokerage.LEVEL_2); //返佣金额小于等于0 直接返回不返佣金 - if(brokeragePrice.compareTo(BigDecimal.ZERO) <= 0) return; + if(brokeragePrice.compareTo(BigDecimal.ZERO) <= 0) { + return; + } //获取上上级推广员信息 double balance = NumberUtil.add(preUser.getBrokeragePrice(),brokeragePrice).doubleValue(); @@ -627,7 +663,9 @@ public class YxUserServiceImpl extends BaseServiceImpl imple }else{ mark = "系统扣除了"+param.getMoney()+"余额"; newMoney = NumberUtil.sub(yxUser.getNowMoney(),param.getMoney()).doubleValue(); - if(newMoney < 0) newMoney = 0d; + if(newMoney < 0) { + newMoney = 0d; + } billService.expend(yxUser.getUid(), "系统减少余额", BillDetailEnum.CATEGORY_1.getValue(), BillDetailEnum.TYPE_7.getValue(), diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java index 59328636..3e66d1cf 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java @@ -79,10 +79,14 @@ public class YxUserSignServiceImpl extends BaseServiceImpl list = systemGroupDataService.getDatas(ShopConstants.YSHOP_SIGN_DAY_NUM); - if(ObjectUtil.isNull(list) || list.isEmpty()) throw new YshopException("请先配置签到天数"); + if(ObjectUtil.isNull(list) || list.isEmpty()) { + throw new YshopException("请先配置签到天数"); + } boolean isDaySign = this.getToDayIsSign(yxUser.getUid()); - if(isDaySign) throw new YshopException("已签到"); + if(isDaySign) { + throw new YshopException("已签到"); + } int signNumber = 0; //积分 int userSignNum = yxUser.getSignNum(); //签到次数 if(getYesterDayIsSign(yxUser.getUid())){ @@ -121,7 +125,9 @@ public class YxUserSignServiceImpl extends BaseServiceImpl 0) return true; + if(count > 0) { + return true; + } return false; } @@ -193,7 +203,9 @@ public class YxUserSignServiceImpl extends BaseServiceImpl 0) return true; + if(count > 0) { + return true; + } return false; } diff --git a/yshop-mproot/src/main/java/co/yixiang/config/MetaHandler.java b/yshop-mproot/src/main/java/co/yixiang/config/MetaHandler.java index db86471e..fe2a3e00 100644 --- a/yshop-mproot/src/main/java/co/yixiang/config/MetaHandler.java +++ b/yshop-mproot/src/main/java/co/yixiang/config/MetaHandler.java @@ -59,7 +59,7 @@ public class MetaHandler implements MetaObjectHandler { this.setFieldValByName("delFlag", false, metaObject); } if(metaObject.hasSetter("addTime")){ - String timestamp = String.valueOf(new Date().getTime()/1000); + String timestamp = String.valueOf(System.currentTimeMillis()/1000); this.setFieldValByName("addTime", Integer.valueOf(timestamp), metaObject); } } catch (Exception e) { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java b/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java index 8dc69130..993ce08f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java @@ -90,7 +90,9 @@ public class StoreCategoryController { } boolean checkResult = yxStoreCategoryService.checkCategory(resources.getPid()); - if(!checkResult) throw new YshopException("分类最多能添加2级哦"); + if(!checkResult) { + throw new YshopException("分类最多能添加2级哦"); + } return new ResponseEntity<>(yxStoreCategoryService.save(resources),HttpStatus.CREATED); } @@ -112,7 +114,9 @@ public class StoreCategoryController { boolean checkResult = yxStoreCategoryService.checkCategory(resources.getPid()); - if(!checkResult) throw new YshopException("分类最多能添加2级哦"); + if(!checkResult) { + throw new YshopException("分类最多能添加2级哦"); + } yxStoreCategoryService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); @@ -142,12 +146,16 @@ public class StoreCategoryController { int count = yxStoreCategoryService.lambdaQuery() .eq(YxStoreCategory::getPid,id) .count(); - if(count > 0) throw new YshopException("请先删除子分类"); + if(count > 0) { + throw new YshopException("请先删除子分类"); + } int countP = yxStoreProductService.lambdaQuery() .eq(YxStoreProduct::getCateId,id) .count(); - if(countP > 0) throw new YshopException("当前分类下有商品不可删除"); + if(countP > 0) { + throw new YshopException("当前分类下有商品不可删除"); + } } } 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 6d1aa4de..b835b070 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 @@ -131,8 +131,12 @@ public class StoreOrderController { @PutMapping(value = "/yxStoreOrder") @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreOrder resources) { - if (StrUtil.isBlank(resources.getDeliveryName())) throw new BadRequestException("请选择快递公司"); - if (StrUtil.isBlank(resources.getDeliveryId())) throw new BadRequestException("快递单号不能为空"); + if (StrUtil.isBlank(resources.getDeliveryName())) { + throw new BadRequestException("请选择快递公司"); + } + if (StrUtil.isBlank(resources.getDeliveryId())) { + throw new BadRequestException("快递单号不能为空"); + } yxStoreOrderService.orderDelivery(resources.getOrderId(),resources.getDeliveryId(), resources.getDeliveryName(),resources.getDeliveryType()); @@ -143,7 +147,9 @@ public class StoreOrderController { @PutMapping(value = "/yxStoreOrder/check") @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity check(@Validated @RequestBody YxStoreOrder resources) { - if (StrUtil.isBlank(resources.getVerifyCode())) throw new BadRequestException("核销码不能为空"); + if (StrUtil.isBlank(resources.getVerifyCode())) { + throw new BadRequestException("核销码不能为空"); + } YxStoreOrderDto storeOrderDTO = generator.convert(yxStoreOrderService.getById(resources.getId()),YxStoreOrderDto.class); if(!resources.getVerifyCode().equals(storeOrderDTO.getVerifyCode())){ throw new BadRequestException("核销码不对"); @@ -185,8 +191,12 @@ public class StoreOrderController { @PostMapping(value = "/yxStoreOrder/edit") @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity editOrder(@RequestBody YxStoreOrder resources) { - if (ObjectUtil.isNull(resources.getPayPrice())) throw new BadRequestException("请输入支付金额"); - if (resources.getPayPrice().doubleValue() < 0) throw new BadRequestException("金额不能低于0"); + if (ObjectUtil.isNull(resources.getPayPrice())) { + throw new BadRequestException("请输入支付金额"); + } + if (resources.getPayPrice().doubleValue() < 0) { + throw new BadRequestException("金额不能低于0"); + } YxStoreOrderDto storeOrder = generator.convert(yxStoreOrderService.getById(resources.getId()),YxStoreOrderDto.class); //判断金额是否有变动,生成一个额外订单号去支付 int res = NumberUtil.compare(storeOrder.getPayPrice().doubleValue(), resources.getPayPrice().doubleValue()); @@ -208,7 +218,9 @@ public class StoreOrderController { @PostMapping(value = "/yxStoreOrder/remark") @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity editOrderRemark(@RequestBody YxStoreOrder resources) { - if (StrUtil.isBlank(resources.getRemark())) throw new BadRequestException("请输入备注"); + if (StrUtil.isBlank(resources.getRemark())) { + throw new BadRequestException("请输入备注"); + } yxStoreOrderService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.OK); } @@ -223,7 +235,9 @@ public class StoreOrderController { ExpressService expressService = ExpressAutoConfiguration.expressService(); ExpressInfo expressInfo = expressService.getExpressInfo(expressInfoDo.getOrderCode(), expressInfoDo.getShipperCode(), expressInfoDo.getLogisticCode()); - if(!expressInfo.isSuccess()) throw new BadRequestException(expressInfo.getReason()); + if(!expressInfo.isSuccess()) { + throw new BadRequestException(expressInfo.getReason()); + } return new ResponseEntity<>(expressInfo, HttpStatus.OK); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java b/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java index 4e60f15c..4e90e98e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java @@ -84,7 +84,7 @@ public class WechatArticleService { WxMpMassSendResult massResult = wxMpService.getMassMessageService() .massGroupMessageSend(massMessage); - if(!massResult.getErrorCode().equals("0")) { + if(!"0".equals(massResult.getErrorCode())) { log.info("error:"+massResult.getErrorMsg()); throw new ErrorRequestException("发送失败"); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java index 6c3a662e..a5ec0d2f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java @@ -88,7 +88,9 @@ public class SystemStoreController { @PreAuthorize("@el.check('yxSystemStore:getl')") public ResponseEntity create(@Validated @RequestBody String jsonStr){ String key = RedisUtil.get(ShopKeyUtils.getTengXunMapKey()); - if(StrUtil.isBlank(key)) throw new BadRequestException("请先配置腾讯地图key"); + if(StrUtil.isBlank(key)) { + throw new BadRequestException("请先配置腾讯地图key"); + } JSONObject jsonObject = JSON.parseObject(jsonStr); String addr = jsonObject.getString("addr"); String url = StrUtil.format("?address={}&key={}",addr,key); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java b/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java index fc0e7a23..22e3e768 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java @@ -97,7 +97,7 @@ public class ShippingTemplatesController { List productList = yxStoreProductService.list(); Arrays.asList(ids).forEach(id->{ for (YxStoreProduct yxStoreProduct : productList) { - if(id==yxStoreProduct.getTempId()){ + if(id.equals(yxStoreProduct.getTempId())){ throw new BadRequestException("运费模板存在商品关联，请删除对应商品"); } } diff --git a/yshop-tools/src/main/java/co/yixiang/tools/config/WxMaConfiguration.java b/yshop-tools/src/main/java/co/yixiang/tools/config/WxMaConfiguration.java index 5100bcb4..c736681d 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/config/WxMaConfiguration.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/config/WxMaConfiguration.java @@ -31,8 +31,7 @@ public class WxMaConfiguration { } @Autowired public WxMaConfiguration(RedisUtils redisUtils) { - this.redisUtils = redisUtils; - this.wxMaMessageHandler = wxMaMessageHandler; + WxMaConfiguration.redisUtils = redisUtils; } public static WxMaService getWxMaService() { @@ -67,10 +66,10 @@ public class WxMaConfiguration { final WxMaMessageRouter router = new WxMaMessageRouter(service); router .rule().handler(wxMaMessageHandler).next() - .rule().async(false).msgType(WxConsts.XmlMsgType.EVENT).event(SystemConfigConstants.BINDSTATECHANGE).handler(bindstatechangeHandler).end(); + .rule().async(false).msgType(WxConsts.XmlMsgType.EVENT).event(SystemConfigConstants.BINDSTATECHANGE).handler(BINDSTATECHANGE_HANDLER).end(); return router; } - private static final WxMaMessageHandler bindstatechangeHandler = (wxMessage, context, service, sessionManager) -> { + private static final WxMaMessageHandler BINDSTATECHANGE_HANDLER = (wxMessage, context, service, sessionManager) -> { wxMessage.getFromUser(); wxMessage.getContent(); return null; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java b/yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java index f6d8b48c..3c84a1da 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java @@ -48,8 +48,9 @@ public class ExpressService implements Serializable { */ public String getVendorName(String vendorCode) { for (Map item : properties.getVendors()) { - if (item.get("code").equals(vendorCode)) + if (item.get("code").equals(vendorCode)) { return item.get("name"); + } } return null; } diff --git a/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java b/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java index 5df75148..afbb23a9 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java @@ -24,12 +24,14 @@ public class ExpressAutoConfiguration { @Autowired public ExpressAutoConfiguration(RedisUtils redisUtil) { - this.redisUtil = redisUtil; + ExpressAutoConfiguration.redisUtil = redisUtil; } public static ExpressService expressService() { ExpressService expressService = (ExpressService)redisUtil.get(ShopConstants.YSHOP_EXPRESS_SERVICE); - if(expressService != null) return expressService; + if(expressService != null) { + return expressService; + } ExpressProperties properties = new ExpressProperties(); String enable = redisUtil.getY("exp_enable"); diff --git a/yshop-tools/src/main/java/co/yixiang/tools/utils/JacksonUtil.java b/yshop-tools/src/main/java/co/yixiang/tools/utils/JacksonUtil.java index 1c137dd5..68ff1c68 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/utils/JacksonUtil.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/utils/JacksonUtil.java @@ -26,8 +26,9 @@ public class JacksonUtil { try { node = mapper.readTree(body); JsonNode leaf = node.get(field); - if (leaf != null) + if (leaf != null) { return leaf.asText(); + } } catch (IOException e) { logger.error(e.getMessage(), e); } @@ -42,9 +43,10 @@ public class JacksonUtil { node = mapper.readTree(body); JsonNode leaf = node.get(field); - if (leaf != null) + if (leaf != null) { return mapper.convertValue(leaf, new TypeReference>() { }); + } } catch (IOException e) { logger.error(e.getMessage(), e); } @@ -57,8 +59,9 @@ public class JacksonUtil { try { node = mapper.readTree(body); JsonNode leaf = node.get(field); - if (leaf != null) + if (leaf != null) { return leaf.asInt(); + } } catch (IOException e) { logger.error(e.getMessage(), e); } @@ -72,9 +75,10 @@ public class JacksonUtil { node = mapper.readTree(body); JsonNode leaf = node.get(field); - if (leaf != null) + if (leaf != null) { return mapper.convertValue(leaf, new TypeReference>() { }); + } } catch (IOException e) { logger.error(e.getMessage(), e); } @@ -88,8 +92,9 @@ public class JacksonUtil { try { node = mapper.readTree(body); JsonNode leaf = node.get(field); - if (leaf != null) + if (leaf != null) { return leaf.asBoolean(); + } } catch (IOException e) { logger.error(e.getMessage(), e); } diff --git a/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java b/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java index d5a374e1..0d666788 100644 --- a/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java +++ b/yshop-weixin/src/main/java/co/yixiang/mp/config/WxMpConfiguration.java @@ -62,17 +62,17 @@ public class WxMpConfiguration { MenuHandler menuHandler,MsgHandler msgHandler,UnsubscribeHandler unsubscribeHandler, SubscribeHandler subscribeHandler,ScanHandler scanHandler, RedisUtils redisUtils){ - this.logHandler = logHandler; - this.nullHandler = nullHandler; - this.kfSessionHandler = kfSessionHandler; - this.storeCheckNotifyHandler = storeCheckNotifyHandler; - this.locationHandler = locationHandler; - this.menuHandler = menuHandler; - this.msgHandler = msgHandler; - this.unsubscribeHandler = unsubscribeHandler; - this.subscribeHandler = subscribeHandler; - this.scanHandler = scanHandler; - this.redisUtils = redisUtils; + WxMpConfiguration.logHandler = logHandler; + WxMpConfiguration.nullHandler = nullHandler; + WxMpConfiguration.kfSessionHandler = kfSessionHandler; + WxMpConfiguration.storeCheckNotifyHandler = storeCheckNotifyHandler; + WxMpConfiguration.locationHandler = locationHandler; + WxMpConfiguration.menuHandler = menuHandler; + WxMpConfiguration.msgHandler = msgHandler; + WxMpConfiguration.unsubscribeHandler = unsubscribeHandler; + WxMpConfiguration.subscribeHandler = subscribeHandler; + WxMpConfiguration.scanHandler = scanHandler; + WxMpConfiguration.redisUtils = redisUtils; } diff --git a/yshop-weixin/src/main/java/co/yixiang/mp/config/WxPayConfiguration.java b/yshop-weixin/src/main/java/co/yixiang/mp/config/WxPayConfiguration.java index 3f21b22f..0748c58c 100644 --- a/yshop-weixin/src/main/java/co/yixiang/mp/config/WxPayConfiguration.java +++ b/yshop-weixin/src/main/java/co/yixiang/mp/config/WxPayConfiguration.java @@ -34,7 +34,7 @@ public class WxPayConfiguration { @Autowired public WxPayConfiguration(RedisUtils redisUtils) { - this.redisUtils = redisUtils; + WxPayConfiguration.redisUtils = redisUtils; } /** diff --git a/yshop-weixin/src/main/java/co/yixiang/mp/service/WeiXinSubscribeService.java b/yshop-weixin/src/main/java/co/yixiang/mp/service/WeiXinSubscribeService.java index 8a49d84e..e7053ab9 100644 --- a/yshop-weixin/src/main/java/co/yixiang/mp/service/WeiXinSubscribeService.java +++ b/yshop-weixin/src/main/java/co/yixiang/mp/service/WeiXinSubscribeService.java @@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage; import cn.hutool.core.util.StrUtil; import co.yixiang.config.SubscribeProperties; +import co.yixiang.constant.ShopConstants; import co.yixiang.modules.user.domain.YxUser; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.service.dto.WechatUserDto; @@ -42,14 +43,16 @@ public class WeiXinSubscribeService { public void rechargeSuccessNotice(String time,String price,Long uid){ String openid = this.getUserOpenid(uid); - if(StrUtil.isBlank(openid)) return; + if(StrUtil.isBlank(openid)) { + return; + } Map map = new HashMap<>(); map.put("first","您的账户金币发生变动，详情如下："); map.put("keyword1","充值"); map.put("keyword2",time); map.put("keyword3",price); - map.put("remark","yshop为你服务！"); + map.put("remark", ShopConstants.YSHOP_WECHAT_PUSH_REMARK); String tempId = this.getTempId(WechatTempateEnum.RECHARGE_SUCCESS.getValue()); this.sendSubscribeMsg( openid, tempId, "/user/account",map); } @@ -64,7 +67,9 @@ public class WeiXinSubscribeService { public void paySuccessNotice(String orderId,String price,Long uid){ String openid = this.getUserOpenid(uid); - if(StrUtil.isBlank(openid)) return; + if(StrUtil.isBlank(openid)) { + return; + } SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss"); Map map = new HashMap<>(); map.put("amount1",price); @@ -87,14 +92,17 @@ public class WeiXinSubscribeService { String openid = this.getUserOpenid(uid); - if(StrUtil.isBlank(openid)) return; + if(StrUtil.isBlank(openid)) { + return; + } Map map = new HashMap<>(); map.put("first","您的订单退款申请被通过，钱款将很快还至您的支付账户。"); - map.put("keyword1",orderId);//订单号 + //订单号 + map.put("keyword1",orderId); map.put("keyword2",price); map.put("keyword3", time); - map.put("remark","yshop为你服务！"); + map.put("remark",ShopConstants.YSHOP_WECHAT_PUSH_REMARK); String tempId = this.getTempId(WechatTempateEnum.REFUND_SUCCESS.getValue()); this.sendSubscribeMsg( openid,tempId, "/order/detail/"+orderId,map); } @@ -111,14 +119,16 @@ public class WeiXinSubscribeService { String openid = this.getUserOpenid(uid); - if(StrUtil.isEmpty(openid)) return; + if(StrUtil.isEmpty(openid)) { + return; + } Map map = new HashMap<>(); map.put("first","亲，宝贝已经启程了，好想快点来到你身边。"); map.put("keyword2",deliveryName); map.put("keyword1",orderId); map.put("keyword3",deliveryId); - map.put("remark","yshop为你服务！"); + map.put("remark",ShopConstants.YSHOP_WECHAT_PUSH_REMARK); String tempId = this.getTempId(WechatTempateEnum.DELIVERY_SUCCESS.getValue()); this.sendSubscribeMsg( openid,tempId, "/order/detail/"+orderId,map); } @@ -170,11 +180,17 @@ public class WeiXinSubscribeService { */ private String getUserOpenid(Long uid){ YxUser yxUser = userService.getById(uid); - if(yxUser == null) return ""; + if(yxUser == null) { + return ""; + } WechatUserDto wechatUserDto = yxUser.getWxProfile(); - if(wechatUserDto == null) return ""; - if(StrUtil.isBlank(wechatUserDto.getRoutineOpenid())) return ""; + if(wechatUserDto == null) { + return ""; + } + if(StrUtil.isBlank(wechatUserDto.getRoutineOpenid())) { + return ""; + } return wechatUserDto.getRoutineOpenid(); } diff --git a/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinPayService.java b/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinPayService.java index 70051314..f79365ae 100644 --- a/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinPayService.java +++ b/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinPayService.java @@ -72,21 +72,29 @@ public class WeixinPayService { long uid = 0; int payPrice = 0; BigDecimal bigDecimal = new BigDecimal(100); - if(BillDetailEnum.TYPE_3.getValue().equals(attach)){ //普通支付 + //普通支付 + if(BillDetailEnum.TYPE_3.getValue().equals(attach)){ YxStoreOrderQueryVo orderInfo = storeOrderService.getOrderInfo(orderId,null); - if(ObjectUtil.isNull(orderInfo)) throw new YshopException("订单不存在"); + if(ObjectUtil.isNull(orderInfo)) { + throw new YshopException("订单不存在"); + } if(orderInfo.getPaid().equals(OrderInfoEnum.PAY_STATUS_1.getValue())) { throw new YshopException("该订单已支付"); } - if(orderInfo.getPayPrice().compareTo(BigDecimal.ZERO) <= 0) throw new YshopException("该支付无需支付"); + if(orderInfo.getPayPrice().compareTo(BigDecimal.ZERO) <= 0) { + throw new YshopException("该支付无需支付"); + } uid = orderInfo.getUid().intValue(); - payPrice = bigDecimal.multiply(orderInfo.getPayPrice()).intValue();//计算分 + //计算分 + payPrice = bigDecimal.multiply(orderInfo.getPayPrice()).intValue(); }else{ //充值 YxUserRecharge userRecharge = userRechargeService.getOne(Wrappers.lambdaQuery() .eq(YxUserRecharge::getOrderId,orderId)); - if(userRecharge == null) throw new BusinessException("充值订单不存在"); + if(userRecharge == null) { + throw new BusinessException("充值订单不存在"); + } if(userRecharge.getPaid().equals(OrderInfoEnum.PAY_STATUS_1.getValue())) { throw new YshopException("该订单已支付"); @@ -97,7 +105,9 @@ public class WeixinPayService { YxUser yxUser = userService.getById(uid); - if(yxUser == null) throw new YshopException("用户错误"); + if(yxUser == null) { + throw new YshopException("用户错误"); + } WechatUserDto wechatUserDto = yxUser.getWxProfile(); @@ -151,15 +161,18 @@ public class WeixinPayService { public void refundOrder(String orderId, Integer totalFee) { YxStoreOrderQueryVo orderInfo = storeOrderService.getOrderInfo(orderId,null); - if(PayTypeEnum.YUE.getValue().equals(orderInfo.getPayType())) return; + if(PayTypeEnum.YUE.getValue().equals(orderInfo.getPayType())) { + return; + } WxPayService wxPayService = WxPayConfiguration.getPayService(PayMethodEnum.WECHAT); WxPayRefundRequest wxPayRefundRequest = new WxPayRefundRequest(); - - wxPayRefundRequest.setTotalFee(totalFee);//订单总金额 + //订单总金额 + wxPayRefundRequest.setTotalFee(totalFee); wxPayRefundRequest.setOutTradeNo(orderId); wxPayRefundRequest.setOutRefundNo(orderId); - wxPayRefundRequest.setRefundFee(totalFee);//退款金额 + //退款金额 + wxPayRefundRequest.setRefundFee(totalFee); wxPayRefundRequest.setNotifyUrl(this.getApiUrl() + "/api/notify/refund"); try { diff --git a/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinTemplateService.java b/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinTemplateService.java index f16c05eb..b4cc4cfc 100644 --- a/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinTemplateService.java +++ b/yshop-weixin/src/main/java/co/yixiang/mp/service/WeixinTemplateService.java @@ -10,6 +10,7 @@ package co.yixiang.mp.service; import cn.hutool.core.util.StrUtil; import co.yixiang.api.YshopException; +import co.yixiang.constant.ShopConstants; import co.yixiang.modules.user.domain.YxUser; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.service.dto.WechatUserDto; @@ -57,14 +58,16 @@ public class WeixinTemplateService { public void rechargeSuccessNotice(String time,String price,Long uid){ String openid = this.getUserOpenid(uid); - if(StrUtil.isBlank(openid)) return; + if(StrUtil.isBlank(openid)) { + return; + } Map map = new HashMap<>(); map.put("first","您的账户金币发生变动，详情如下："); map.put("keyword1","充值"); map.put("keyword2",time); map.put("keyword3",price); - map.put("remark","yshop为你服务！"); + map.put("remark", ShopConstants.YSHOP_WECHAT_PUSH_REMARK); String tempId = this.getTempId(WechatTempateEnum.RECHARGE_SUCCESS.getValue()); this.sendWxMpTemplateMessage( openid, tempId, this.getSiteUrl()+"/user/account",map); } @@ -80,13 +83,16 @@ public class WeixinTemplateService { String openid = this.getUserOpenid(uid); - if(StrUtil.isBlank(openid)) return; + if(StrUtil.isBlank(openid)) { + return; + } Map map = new HashMap<>(); map.put("first","您的订单已支付成功，我们会尽快为您发货。"); - map.put("keyword1",orderId);//订单号 + //订单号 + map.put("keyword1",orderId); map.put("keyword2",price); - map.put("remark","yshop为你服务！"); + map.put("remark",ShopConstants.YSHOP_WECHAT_PUSH_REMARK); String tempId = this.getTempId(WechatTempateEnum.PAY_SUCCESS.getValue()); this.sendWxMpTemplateMessage( openid,tempId, this.getSiteUrl()+"/order/detail/"+orderId,map); } @@ -102,14 +108,17 @@ public class WeixinTemplateService { String openid = this.getUserOpenid(uid); - if(StrUtil.isBlank(openid)) return; + if(StrUtil.isBlank(openid)) { + return; + } Map map = new HashMap<>(); map.put("first","您的订单退款申请被通过，钱款将很快还至您的支付账户。"); - map.put("keyword1",orderId);//订单号 + //订单号 + map.put("keyword1",orderId); map.put("keyword2",price); map.put("keyword3", time); - map.put("remark","yshop为你服务！"); + map.put("remark",ShopConstants.YSHOP_WECHAT_PUSH_REMARK); String tempId = this.getTempId(WechatTempateEnum.REFUND_SUCCESS.getValue()); this.sendWxMpTemplateMessage( openid,tempId, this.getSiteUrl()+"/order/detail/"+orderId,map); } @@ -126,14 +135,16 @@ public class WeixinTemplateService { String openid = this.getUserOpenid(uid); - if(StrUtil.isEmpty(openid)) return; + if(StrUtil.isEmpty(openid)) { + return; + } Map map = new HashMap<>(); map.put("first","亲，宝贝已经启程了，好想快点来到你身边。"); map.put("keyword2",deliveryName); map.put("keyword1",orderId); map.put("keyword3",deliveryId); - map.put("remark","yshop为你服务！"); + map.put("remark",ShopConstants.YSHOP_WECHAT_PUSH_REMARK); String tempId = this.getTempId(WechatTempateEnum.DELIVERY_SUCCESS.getValue()); this.sendWxMpTemplateMessage( openid,tempId, this.getSiteUrl()+"/order/detail/"+orderId,map); } @@ -173,7 +184,9 @@ public class WeixinTemplateService { YxWechatTemplate yxWechatTemplate = yxWechatTemplateService.lambdaQuery() .eq(YxWechatTemplate::getTempkey,key) .one(); - if (yxWechatTemplate == null) throw new YshopException("请后台配置key:" + key + "模板消息id"); + if (yxWechatTemplate == null) { + throw new YshopException("请后台配置key:" + key + "模板消息id"); + } return yxWechatTemplate.getTempid(); } @@ -197,11 +210,17 @@ public class WeixinTemplateService { */ private String getUserOpenid(Long uid){ YxUser yxUser = userService.getById(uid); - if(yxUser == null) return ""; + if(yxUser == null) { + return ""; + } WechatUserDto wechatUserDto = yxUser.getWxProfile(); - if(wechatUserDto == null) return ""; - if(StrUtil.isBlank(wechatUserDto.getOpenid())) return ""; + if(wechatUserDto == null) { + return ""; + } + if(StrUtil.isBlank(wechatUserDto.getOpenid())) { + return ""; + } return wechatUserDto.getOpenid(); }