From 270db3b53e552b69d64308c4983295281896a7d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=99=93=E4=BC=9F?= Date: Wed, 15 Mar 2023 08:35:52 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Object=E7=9A=84equals=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=AE=B9=E6=98=93=E6=8A=9B=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E5=BA=94=E4=BD=BF=E7=94=A8=E5=B8=B8=E9=87=8F?= =?UTF-8?q?=E6=88=96=E7=A1=AE=E5=AE=9A=E6=9C=89=E5=80=BC=E7=9A=84=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E6=9D=A5=E8=B0=83=E7=94=A8equals=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StoreProductController.java | 2 +- .../java/com/zbkj/common/utils/CrmebUtil.java | 6 +- .../com/zbkj/common/utils/ImageMergeUtil.java | 2 +- .../java/com/zbkj/common/utils/UrlUtil.java | 2 +- .../zbkj/common/utils/ValidateFormUtil.java | 12 ++-- .../java/com/zbkj/common/utils/WxUtil.java | 2 +- .../common/utils/genutils/GenCodeUtils.java | 2 +- .../front/service/impl/QrCodeServiceImpl.java | 2 +- .../service/impl/UserCenterServiceImpl.java | 4 +- .../com/zbkj/service/delete/OrderUtils.java | 6 +- .../service/impl/CallbackServiceImpl.java | 2 +- .../service/impl/ExpressServiceImpl.java | 2 +- .../service/impl/LogisticsServiceImpl.java | 8 +-- .../service/impl/OnePassServiceImpl.java | 2 +- .../service/impl/OrderPayServiceImpl.java | 16 ++--- .../service/impl/OrderServiceImpl.java | 10 +-- .../service/impl/OrderTaskServiceImpl.java | 2 +- .../ShippingTemplatesFreeServiceImpl.java | 2 +- .../ShippingTemplatesRegionServiceImpl.java | 2 +- .../service/impl/StoreBargainServiceImpl.java | 6 +- .../service/impl/StoreCartServiceImpl.java | 2 +- .../impl/StoreCombinationServiceImpl.java | 6 +- .../service/impl/StoreCouponServiceImpl.java | 2 +- .../impl/StoreCouponUserServiceImpl.java | 4 +- .../StoreProductAttrValueServiceImpl.java | 4 +- .../service/impl/StoreProductServiceImpl.java | 10 +-- .../service/impl/StoreSeckillServiceImpl.java | 6 +- .../service/impl/SystemCityServiceImpl.java | 2 +- .../impl/SystemFormTempServiceImpl.java | 2 +- .../service/impl/SystemMenuServiceImpl.java | 10 +-- .../impl/SystemNotificationServiceImpl.java | 14 ++--- .../service/impl/UploadServiceImpl.java | 20 +++--- .../service/impl/UserBillServiceImpl.java | 4 +- .../service/impl/WeChatPayServiceImpl.java | 10 +-- .../service/impl/WechatNewServiceImpl.java | 62 +++++++++---------- .../service/impl/WechatPublicServiceImpl.java | 2 +- .../zbkj/service/util/yly/RequestMethod.java | 4 +- .../java/com/zbkj/service/util/yly/Utils.java | 2 +- 38 files changed, 129 insertions(+), 129 deletions(-) diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductController.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductController.java index a698b906..80e43fcc 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductController.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/controller/StoreProductController.java @@ -90,7 +90,7 @@ public class StoreProductController { @RequestMapping(value = "/delete/{id}", method = RequestMethod.GET) public CommonResult delete(@RequestBody @PathVariable Integer id, @RequestParam(value = "type", required = false, defaultValue = "recycle")String type) { if (storeProductService.deleteProduct(id, type)) { - if (type.equals("recycle")) { + if ("recycle".equals(type)) { storeCartService.productStatusNotEnable(id); } else { storeCartService.productDelete(id); diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java index 8d04e596..80583f2f 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java @@ -396,7 +396,7 @@ public class CrmebUtil { } ip = request.getRemoteAddr(); - if(ip.equals("0:0:0:0:0:0:0:1")){ + if("0:0:0:0:0:0:0:1".equals(ip)){ //本地 localhost访问 ipv6 ip = "127.0.0.1"; } @@ -419,11 +419,11 @@ public class CrmebUtil { return false; } - if(ip.equals("unKnown")){ + if("unKnown".equals(ip)){ return false; } - if(ip.equals("unknown")){ + if("unknown".equals(ip)){ return false; } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ImageMergeUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ImageMergeUtil.java index 3cbdc210..c5c72f9d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ImageMergeUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ImageMergeUtil.java @@ -73,7 +73,7 @@ public class ImageMergeUtil { File file = new File(fileName); BufferedImage read = ImageIO.read(file); - if(bufferedImage == null || bufferedImage.equals("")){ + if(bufferedImage == null || "".equals(bufferedImage)){ imageMergeUtilVo.setX(0); imageMergeUtilVo.setY(0); //创建新的画布，宽高以第一个图为准 diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UrlUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UrlUtil.java index ff320b41..e12d333d 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UrlUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UrlUtil.java @@ -41,7 +41,7 @@ public class UrlUtil { return entity; } url = url.trim(); - if (url.equals("")) { + if ("".equals(url)) { return entity; } String[] urlParts = url.split("\\?"); diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateFormUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateFormUtil.java index e13a949f..0c1da7ac 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateFormUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateFormUtil.java @@ -40,37 +40,37 @@ public class ValidateFormUtil { List val = CrmebUtil.stringToArrayStrRegex(value, ":"); ////必填 - if(val.get(0).equals("required") && val.get(1).equals("true")){ + if("required".equals(val.get(0)) && "true".equals(val.get(1))){ isRequire(systemConfig.getValue(), systemConfig.getTitle()); continue; } //数字 - if(val.get(0).equals("number") && val.get(1).equals("true")){ + if("number".equals(val.get(0)) && "true".equals(val.get(1))){ isNumber(systemConfig.getValue(), systemConfig.getTitle()); continue; } //最大值 - if(val.get(0).equals("max")){ + if("max".equals(val.get(0))){ isNumber(systemConfig.getValue(), systemConfig.getTitle()); continue; } //最小值 - if(val.get(0).equals("min")){ + if("min".equals(val.get(0))){ isNumber(systemConfig.getValue(), systemConfig.getTitle()); continue; } //邮箱 - if(val.get(0).equals("email") && val.get(1).equals("true")){ + if("email".equals(val.get(0)) && "true".equals(val.get(1))){ isEmail(systemConfig.getValue(), systemConfig.getTitle()); continue; } //手机 - if(val.get(0).equals("phone") && val.get(1).equals("true")){ + if("phone".equals(val.get(0)) && "true".equals(val.get(1))){ isPhone(systemConfig.getValue(), systemConfig.getTitle()); } } diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxUtil.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxUtil.java index 32a0263b..31ebc8e0 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxUtil.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxUtil.java @@ -55,7 +55,7 @@ public class WxUtil { if(ObjectUtil.isNull(result)){ throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if(result.containsKey("errcode") && result.getString("errcode").equals("0")){ + if(result.containsKey("errcode") && "0".equals(result.getString("errcode"))){ return result; } if(result.containsKey("errmsg")){ diff --git a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java index d885b966..6928e3e3 100644 --- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java +++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java @@ -91,7 +91,7 @@ public class GenCodeUtils { columnEntity.setAttrType(attrType); - if (!hasBigDecimal && attrType.equals("BigDecimal")) { + if (!hasBigDecimal && "BigDecimal".equals(attrType)) { hasBigDecimal = true; } if (!hasList && "array".equals(columnEntity.getExtra())) { diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/QrCodeServiceImpl.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/QrCodeServiceImpl.java index 8e08b8b7..8fe9b028 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/QrCodeServiceImpl.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/QrCodeServiceImpl.java @@ -50,7 +50,7 @@ public class QrCodeServiceImpl implements QrCodeService { Map dataMap = JSONObject.toJavaObject(data, Map.class); for (Map.Entry m : dataMap.entrySet()) { - if(m.getKey().equals("path")){ + if("path".equals(m.getKey())){ //前端路由， 不需要拼参数 page = m.getValue().toString(); continue; diff --git a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java index 3dcf1677..4f232af4 100644 --- a/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java +++ b/crmeb/crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java @@ -951,10 +951,10 @@ public class UserCenterServiceImpl extends ServiceImpl implements * 绑定手机号数据校验 */ private void checkBindingPhone(WxBindingPhoneRequest request) { - if (!request.getType().equals("public") && !request.getType().equals("routine") && !request.getType().equals("iosWx") && !request.getType().equals("androidWx")) { + if (!"public".equals(request.getType()) && !"routine".equals(request.getType()) && !"iosWx".equals(request.getType()) && !"androidWx".equals(request.getType())) { throw new CrmebException("未知的用户类型"); } - if (request.getType().equals("public")) { + if ("public".equals(request.getType())) { if (StrUtil.isBlank(request.getCaptcha())) { throw new CrmebException("验证码不能为空"); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/OrderUtils.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/OrderUtils.java index 40a457e0..b605ca15 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/OrderUtils.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/delete/OrderUtils.java @@ -68,13 +68,13 @@ public class OrderUtils { payType = payType.toLowerCase(); switch (payType){ case PayConstants.PAY_TYPE_WE_CHAT: - result = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_PAY_WEIXIN_OPEN).equals("1"); + result = "1".equals(systemConfigService.getValueByKey(SysConfigConstants.CONFIG_PAY_WEIXIN_OPEN)); break; case PayConstants.PAY_TYPE_YUE: - result = (systemConfigService.getValueByKey(SysConfigConstants.CONFIG_YUE_PAY_STATUS).equals("1")); + result = ("1".equals(systemConfigService.getValueByKey(SysConfigConstants.CONFIG_YUE_PAY_STATUS))); break; case PayConstants.PAY_TYPE_ALI_PAY: - result = (systemConfigService.getValueByKey(SysConfigConstants.CONFIG_ALI_PAY_STATUS).equals("1")); + result = ("1".equals(systemConfigService.getValueByKey(SysConfigConstants.CONFIG_ALI_PAY_STATUS))); break; } return result; diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CallbackServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CallbackServiceImpl.java index c787e43e..5af3eb51 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CallbackServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/CallbackServiceImpl.java @@ -285,7 +285,7 @@ public class CallbackServiceImpl implements CallbackService { public String weChatRefund(String xmlInfo) { MyRecord notifyRecord = new MyRecord(); MyRecord refundRecord = refundNotify(xmlInfo, notifyRecord); - if (refundRecord.getStr("status").equals("fail")) { + if ("fail".equals(refundRecord.getStr("status"))) { logger.error("微信退款回调失败==>" + refundRecord.getColumns() + ", rawData==>" + xmlInfo + ", data==>" + notifyRecord); return refundRecord.getStr("returnXml"); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExpressServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExpressServiceImpl.java index b2515dc0..0311c82e 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExpressServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ExpressServiceImpl.java @@ -133,7 +133,7 @@ public class ExpressServiceImpl extends ServiceImpl impleme public List findAll(String type) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(Express::getIsShow, true); - if (type.equals("elec")) { + if ("elec".equals(type)) { lqw.eq(Express::getStatus, true); } lqw.orderByDesc(Express::getSort); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/LogisticsServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/LogisticsServiceImpl.java index b4749d0c..ea018a24 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/LogisticsServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/LogisticsServiceImpl.java @@ -76,7 +76,7 @@ public class LogisticsServiceImpl implements LogisticService { return JSONObject.toJavaObject(result, LogisticsResultVo.class); } String logisticsType = systemConfigService.getValueByKeyException("logistics_type"); - if (logisticsType.equals("1")) {// 平台查询 + if ("1".equals(logisticsType)) {// 平台查询 OnePassLogisticsQueryVo queryVo = onePassService.exprQuery(expressNo, com); if (ObjectUtil.isNull(queryVo)) { return resultVo; @@ -86,11 +86,11 @@ public class LogisticsServiceImpl implements LogisticService { String jsonString = JSONObject.toJSONString(resultVo); saveCache(JSONObject.parseObject(jsonString)); } - if (logisticsType.equals("2")) {// 阿里云查询 + if ("2".equals(logisticsType)) {// 阿里云查询 String appCode = systemConfigService.getValueByKey(Constants.CONFIG_KEY_LOGISTICS_APP_CODE); // 顺丰请输入单号 : 收件人或寄件人手机号后四位。例如：123456789:1234 - if (StrUtil.isNotBlank(com) && com.equals("shunfengkuaiyun")) { + if (StrUtil.isNotBlank(com) && "shunfengkuaiyun".equals(com)) { expressNo = expressNo.concat(":").concat(StrUtil.sub(phone, 7, -1)); } String url = Constants.LOGISTICS_API_URL + "?no=" + expressNo; @@ -162,7 +162,7 @@ public class LogisticsServiceImpl implements LogisticService { * @since 2020-07-06 */ private void checkResult(JSONObject data) { - if (!data.getString("status").equals("0")){ + if (!"0".equals(data.getString("status"))){ throw new CrmebException(data.getString("msg")); } } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassServiceImpl.java index 9f0b2c57..d28fe713 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassServiceImpl.java @@ -390,7 +390,7 @@ public class OnePassServiceImpl implements OnePassService { params.add("num", expressNo); JSONObject post = onePassUtil.postFrom(OnePassConstants.ONE_PASS_API_URL + OnePassConstants.ONE_PASS_API_EXPRESS_QUEARY_URI, params, header); String dataStr = post.getString("data"); - if (StrUtil.isBlank(dataStr) || dataStr.equals("[]")) { + if (StrUtil.isBlank(dataStr) || "[]".equals(dataStr)) { return null; } JSONObject jsonObject = post.getJSONObject("data"); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java index 43e0d5a4..a1cf0a41 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderPayServiceImpl.java @@ -233,9 +233,9 @@ public class OrderPayServiceImpl implements OrderPayService { // 分销员逻辑 if (!user.getIsPromoter()) { String funcStatus = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_KEY_BROKERAGE_FUNC_STATUS); - if (funcStatus.equals("1")) { + if ("1".equals(funcStatus)) { String broQuota = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_KEY_STORE_BROKERAGE_QUOTA); - if (!broQuota.equals("-1") && storeOrder.getPayPrice().compareTo(new BigDecimal(broQuota)) >= 0) {// -1 不成为分销员 + if (!"-1".equals(broQuota) && storeOrder.getPayPrice().compareTo(new BigDecimal(broQuota)) >= 0) {// -1 不成为分销员 user.setIsPromoter(true); user.setPromoterTime(cn.hutool.core.date.DateUtil.date()); } @@ -413,7 +413,7 @@ public class OrderPayServiceImpl implements OrderPayService { private List assignCommission(StoreOrder storeOrder) { // 检测商城是否开启分销功能 String isOpen = systemConfigService.getValueByKey(Constants.CONFIG_KEY_STORE_BROKERAGE_IS_OPEN); - if(StrUtil.isBlank(isOpen) || isOpen.equals("0")){ + if(StrUtil.isBlank(isOpen) || "0".equals(isOpen)){ return CollUtil.newArrayList(); } // 营销产品不参与 @@ -535,7 +535,7 @@ public class OrderPayServiceImpl implements OrderPayService { } // 判断分销模式 String model = systemConfigService.getValueByKey(Constants.CONFIG_KEY_STORE_BROKERAGE_MODEL); - if (StrUtil.isNotBlank(model) && model.equals("1") && !spreadUser.getIsPromoter()) { + if (StrUtil.isNotBlank(model) && "1".equals(model) && !spreadUser.getIsPromoter()) { // 指定分销模式下：不是推广员不参与分销 return recordList; } @@ -549,7 +549,7 @@ public class OrderPayServiceImpl implements OrderPayService { if (ObjectUtil.isNull(spreadSpreadUser)) { return recordList; } - if (StrUtil.isNotBlank(model) && model.equals("1") && !spreadSpreadUser.getIsPromoter()) { + if (StrUtil.isNotBlank(model) && "1".equals(model) && !spreadSpreadUser.getIsPromoter()) { // 指定分销模式下：不是推广员不参与分销 return recordList; } @@ -926,10 +926,10 @@ public class OrderPayServiceImpl implements OrderPayService { integralRecord.setTitle(IntegralRecordConstants.BROKERAGE_RECORD_TITLE_ORDER); integralRecord.setIntegral(integral); integralRecord.setBalance(balance); - if (type.equals("order")){ + if ("order".equals(type)){ integralRecord.setMark(StrUtil.format("用户付款成功,订单增加{}积分", integral)); } - if (type.equals("product")) { + if ("product".equals(type)) { integralRecord.setMark(StrUtil.format("用户付款成功,商品增加{}积分", integral)); } integralRecord.setStatus(IntegralRecordConstants.INTEGRAL_RECORD_STATUS_CREATE); @@ -1002,7 +1002,7 @@ public class OrderPayServiceImpl implements OrderPayService { for (int i = 0; i < couponsForGiveUser.size();) { StoreProductCoupon storeProductCoupon = couponsForGiveUser.get(i); MyRecord record = storeCouponUserService.paySuccessGiveAway(storeProductCoupon.getIssueCouponId(), storeOrder.getUid()); - if (record.getStr("status").equals("fail")) { + if ("fail".equals(record.getStr("status"))) { logger.error(StrUtil.format("支付成功领取优惠券失败，失败原因：{}", record.getStr("errMsg"))); couponsForGiveUser.remove(i); continue; diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java index 2bc9e386..9a6970b7 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java @@ -942,7 +942,7 @@ public class OrderServiceImpl implements OrderService { } // 自提开关是否打开 String storeSelfMention = systemConfigService.getValueByKey(SysConfigConstants.CONFIG_KEY_STORE_SELF_MENTION); - if (storeSelfMention.equals("false")) { + if ("false".equals(storeSelfMention)) { throw new CrmebException("请先联系管理员开启门店自提"); } SystemStore systemStore = systemStoreService.getById(request.getStoreId()); @@ -1332,12 +1332,12 @@ public class OrderServiceImpl implements OrderService { private OrderInfoVo validatePreOrderRequest(PreOrderRequest request, User user) { OrderInfoVo orderInfoVo = new OrderInfoVo(); List detailVoList = CollUtil.newArrayList(); - if (request.getPreOrderType().equals("shoppingCart")) {// 购物车购买 + if ("shoppingCart".equals(request.getPreOrderType())) {// 购物车购买 detailVoList = validatePreOrderShopping(request, user); List cartIdList = request.getOrderDetails().stream().map(PreOrderDetailRequest::getShoppingCartId).distinct().collect(Collectors.toList()); orderInfoVo.setCartIdList(cartIdList); } - if (request.getPreOrderType().equals("buyNow")) {// 立即购买 + if ("buyNow".equals(request.getPreOrderType())) {// 立即购买 // 立即购买只会有一条详情 PreOrderDetailRequest detailRequest = request.getOrderDetails().get(0); if (detailRequest.getSeckillId() > 0) {// 秒杀 @@ -1409,7 +1409,7 @@ public class OrderServiceImpl implements OrderService { detailVoList.add(detailVo); } } - if (request.getPreOrderType().equals("again")) {// 再次购买 + if ("again".equals(request.getPreOrderType())) {// 再次购买 PreOrderDetailRequest detailRequest = request.getOrderDetails().get(0); detailVoList = validatePreOrderAgain(detailRequest, user); } @@ -1891,7 +1891,7 @@ public class OrderServiceImpl implements OrderService { // 全场满额包邮金额 String storeFreePostageString = systemConfigService.getValueByKey(SysConfigConstants.STORE_FEE_POSTAGE); BigDecimal storePostage = BigDecimal.ZERO; - if (postageSwitchString.equals("true") && (storeFreePostageString.equals("0") || orderInfoVo.getProTotalFee().compareTo(new BigDecimal(storeFreePostageString)) >= 0)) { + if ("true".equals(postageSwitchString) && ("0".equals(storeFreePostageString) || orderInfoVo.getProTotalFee().compareTo(new BigDecimal(storeFreePostageString)) >= 0)) { storePostage = BigDecimal.ZERO; } else if (ObjectUtil.isNull(userAddress) || userAddress.getCityId() <= 0) { // 用户地址不存在，默认运费为0元 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java index 4de544f3..b97ea01a 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderTaskServiceImpl.java @@ -282,7 +282,7 @@ public class OrderTaskServiceImpl implements OrderTaskService { // 根据订单状态表判断订单是否可以自动完成 for (StoreOrder order : orderList) { StoreOrderStatus orderStatus = storeOrderStatusService.getLastByOrderId(order.getId()); - if (!orderStatus.getChangeType().equals("user_take_delivery")) { + if (!"user_take_delivery".equals(orderStatus.getChangeType())) { logger.error("订单自动完成：订单记录最后一条不是收货状态，orderId = " + order.getId()); continue ; } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesFreeServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesFreeServiceImpl.java index c0234d73..53ea6af6 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesFreeServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/ShippingTemplatesFreeServiceImpl.java @@ -59,7 +59,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - if (type.equals("add")) { + if ("add".equals(type)) { updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales - {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota + {}", num)); } - if (type.equals("sub")) { + if ("sub".equals(type)) { updateWrapper.setSql(StrUtil.format("stock = stock - {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales + {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota - {}", num)); @@ -887,7 +887,7 @@ public class StoreBargainServiceImpl extends ServiceImpl i Integer userId = userService.getUserIdException(); Map map = new HashMap<>(); int num; - if (request.getType().equals("total")) { + if ("total".equals(request.getType())) { num = getUserCountByStatus(userId, request.getNumType()); } else { num = getUserSumByStatus(userId, request.getNumType()); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCombinationServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCombinationServiceImpl.java index b3cf292f..3fbafea6 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCombinationServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreCombinationServiceImpl.java @@ -961,12 +961,12 @@ public class StoreCombinationServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - if (type.equals("add")) { + if ("add".equals(type)) { updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales - {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota + {}", num)); } - if (type.equals("sub")) { + if ("sub".equals(type)) { updateWrapper.setSql(StrUtil.format("stock = stock - {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales + {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota - {}", num)); @@ -1069,7 +1069,7 @@ public class StoreCombinationServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(StoreCouponUser::getUid, userId); - if (type.equals("usable")) { + if ("usable".equals(type)) { lqw.eq(StoreCouponUser::getStatus, CouponConstants.STORE_COUPON_USER_STATUS_USABLE); lqw.orderByDesc(StoreCouponUser::getId); } - if (type.equals("unusable")) { + if ("unusable".equals(type)) { lqw.gt(StoreCouponUser::getStatus, CouponConstants.STORE_COUPON_USER_STATUS_USABLE); lqw.last(StrUtil.format(" order by case `status` when {} then {} when {} then {} when {} then {} end", 0, 1, 1, 2, 2, 3)); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrValueServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrValueServiceImpl.java index 4261ff05..7fc9a20d 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrValueServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductAttrValueServiceImpl.java @@ -126,14 +126,14 @@ public class StoreProductAttrValueServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - if (operationType.equals("add")) { + if ("add".equals(operationType)) { updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales - {}", num)); if (type > 0) { updateWrapper.setSql(StrUtil.format("quota = quota + {}", num)); } } - if (operationType.equals("sub")) { + if ("sub".equals(operationType)) { updateWrapper.setSql(StrUtil.format("stock = stock - {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales + {}", num)); if (type > 0) { diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductServiceImpl.java index 7ade18a1..f8a25c5e 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreProductServiceImpl.java @@ -688,7 +688,7 @@ public class StoreProductServiceImpl extends ServiceImpl getProductActivityList(String activityStr) { List activityList = CollUtil.newArrayList(); - if (activityStr.equals("0, 1, 2, 3")) { + if ("0, 1, 2, 3".equals(activityStr)) { activityList.add(Constants.PRODUCT_TYPE_NORMAL_STR); activityList.add(Constants.PRODUCT_TYPE_SECKILL_STR); activityList.add(Constants.PRODUCT_TYPE_BARGAIN_STR); @@ -975,7 +975,7 @@ public class StoreProductServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - if (type.equals("add")) { + if ("add".equals(type)) { updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales - {}", num)); } - if (type.equals("sub")) { + if ("sub".equals(type)) { updateWrapper.setSql(StrUtil.format("stock = stock - {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales + {}", num)); // 扣减时加乐观锁保证库存不为负 diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillServiceImpl.java index ae2d115a..dc92e534 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreSeckillServiceImpl.java @@ -829,12 +829,12 @@ public class StoreSeckillServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - if (type.equals("add")) { + if ("add".equals(type)) { updateWrapper.setSql(StrUtil.format("stock = stock + {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales - {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota + {}", num)); } - if (type.equals("sub")) { + if ("sub".equals(type)) { updateWrapper.setSql(StrUtil.format("stock = stock - {}", num)); updateWrapper.setSql(StrUtil.format("sales = sales + {}", num)); updateWrapper.setSql(StrUtil.format("quota = quota - {}", num)); @@ -916,7 +916,7 @@ public class StoreSeckillServiceImpl extends ServiceImpl getCityIdList() { Object data = redisUtil.get(Constants.CITY_LIST_LEVEL_1); List collect; - if (data == null || data.equals("")) { + if (data == null || "".equals(data)) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.select(SystemCity::getCityId); lambdaQueryWrapper.eq(SystemCity::getLevel, 1); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemFormTempServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemFormTempServiceImpl.java index 8cade286..ee42a120 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemFormTempServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/SystemFormTempServiceImpl.java @@ -88,7 +88,7 @@ public class SystemFormTempServiceImpl extends ServiceImpl impl if (request.getSort() == null) { queryWrapper.orderByDesc("create_time"); }else{ - if (request.getSort().equals("asc")) { + if ("asc".equals(request.getSort())) { queryWrapper.orderByAsc("number"); }else{ queryWrapper.orderByDesc("number"); @@ -123,7 +123,7 @@ public class UserBillServiceImpl extends ServiceImpl impl //关联id if (StringUtils.isNotBlank(request.getLinkId())) { - if (request.getLinkId().equals("gt")) { + if ("gt".equals(request.getLinkId())) { queryWrapper.ne("link_id", 0); }else{ queryWrapper.eq("link_id", request.getLinkId()); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java index 10501890..28692119 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WeChatPayServiceImpl.java @@ -108,7 +108,7 @@ public class WeChatPayServiceImpl implements WeChatPayService { } // 切割字符串，判断是支付订单还是充值订单 String pre = StrUtil.subPre(orderNo, 5); - if (pre.equals("order")) {// 支付订单 + if ("order".equals(pre)) {// 支付订单 StoreOrder storeOrder = storeOrderService.getByOderId(orderNo); if (ObjectUtil.isNull(storeOrder)) { throw new CrmebException("订单不存在"); @@ -253,12 +253,12 @@ public class WeChatPayServiceImpl implements WeChatPayService { String appId = ""; String mchId = ""; String signKey = ""; - if (userRecharge.getRechargeType().equals("public")) {// 公众号 + if ("public".equals(userRecharge.getRechargeType())) {// 公众号 appId = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_WE_CHAT_APP_ID); mchId = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_WE_CHAT_MCH_ID); signKey = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_WE_CHAT_APP_KEY); } - if (userRecharge.getRechargeType().equals("routine")) {// 小程序 + if ("routine".equals(userRecharge.getRechargeType())) {// 小程序 appId = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_ROUTINE_APP_ID); mchId = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_ROUTINE_MCH_ID); signKey = systemConfigService.getValueByKeyException(Constants.CONFIG_KEY_PAY_ROUTINE_APP_KEY); @@ -423,11 +423,11 @@ public class WeChatPayServiceImpl implements WeChatPayService { throw new CrmebException("微信下单失败！"); } CreateOrderResponseVo responseVo = CrmebUtil.mapToObj(map, CreateOrderResponseVo.class); - if (responseVo.getReturnCode().toUpperCase().equals("FAIL")) { + if ("FAIL".equals(responseVo.getReturnCode().toUpperCase())) { throw new CrmebException("微信下单失败1！" + responseVo.getReturnMsg()); } - if (responseVo.getResultCode().toUpperCase().equals("FAIL")) { + if ("FAIL".equals(responseVo.getResultCode().toUpperCase())) { throw new CrmebException("微信下单失败2！" + responseVo.getErrCodeDes()); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatNewServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatNewServiceImpl.java index 10c2fb1f..8ca9de8c 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatNewServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatNewServiceImpl.java @@ -145,7 +145,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { + if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { if (data.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(data, "微信获取开放平台access_token异常"); @@ -169,7 +169,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { + if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { if (data.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(data, "微信获取开放平台用户信息异常"); @@ -198,7 +198,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { + if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { if (data.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(data, "微信小程序登录凭证校验异常"); @@ -261,7 +261,7 @@ public class WechatNewServiceImpl implements WechatNewService { JSONObject data = JSONObject.parseObject(response); // 保存到微信异常表 wxExceptionDispose(data, "微信小程序生成小程序码异常"); - if (data.getString("errcode").equals("40001")) { + if ("40001".equals(data.getString("errcode"))) { redisUtil.delete(WeChatConstants.REDIS_WECAHT_MINI_ACCESS_TOKEN_KEY); miniAccessToken = getMiniAccessToken(); url = StrUtil.format(WeChatConstants.WECHAT_MINI_QRCODE_UNLIMITED_URL, miniAccessToken); @@ -310,7 +310,7 @@ public class WechatNewServiceImpl implements WechatNewService { WechatPayInfo wechatPayInfo = createWechatPayInfo(unifiedorderVo); CreateOrderResponseVo responseVo = CrmebUtil.mapToObj(map, CreateOrderResponseVo.class); - if (responseVo.getReturnCode().toUpperCase().equals("FAIL")) { + if ("FAIL".equals(responseVo.getReturnCode().toUpperCase())) { // 保存到微信异常表 wxPayExceptionDispose(map, "微信支付预下单异常"); wechatPayInfo.setErrCode(map.get("return_code").toString()); @@ -318,7 +318,7 @@ public class WechatNewServiceImpl implements WechatNewService { throw new CrmebException("微信下单失败1！" + responseVo.getReturnMsg()); } - if (responseVo.getResultCode().toUpperCase().equals("FAIL")) { + if ("FAIL".equals(responseVo.getResultCode().toUpperCase())) { wxPayExceptionDispose(map, "微信支付预下单业务异常"); wechatPayInfo.setErrCode(map.get("err_code").toString()); wechatPayInfoService.save(wechatPayInfo); @@ -381,16 +381,16 @@ public class WechatNewServiceImpl implements WechatNewService { throw new CrmebException("微信订单查询失败！"); } record.setColums(map); - if (record.getStr("return_code").toUpperCase().equals("FAIL")) { + if ("FAIL".equals(record.getStr("return_code").toUpperCase())) { wxPayQueryExceptionDispose(record, "微信支付查询订单通信异常"); throw new CrmebException("微信订单查询失败1！" + record.getStr("return_msg")); } - if (record.getStr("result_code").toUpperCase().equals("FAIL")) { + if ("FAIL".equals(record.getStr("result_code").toUpperCase())) { wxPayQueryExceptionDispose(record, "微信支付查询订单结果异常"); throw new CrmebException("微信订单查询失败2！" + record.getStr("err_code") + record.getStr("err_code_des")); } - if (!record.getStr("trade_state").toUpperCase().equals("SUCCESS")) { + if (!"SUCCESS".equals(record.getStr("trade_state").toUpperCase())) { wxPayQueryExceptionDispose(record, "微信支付查询订单状态异常"); throw new CrmebException("微信订单支付失败3！" + record.getStr("trade_state")); } @@ -417,7 +417,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { + if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { if (data.containsKey("errmsg")) { wxExceptionDispose(data, "微信公众号发送模板消息异常"); throw new CrmebException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg")); @@ -441,15 +441,15 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { - if (data.getString("errcode").equals("40001")) { + if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { + if ("40001".equals(data.getString("errcode"))) { wxExceptionDispose(data, "微信小程序发送订阅消息异常"); redisUtil.delete(WeChatConstants.REDIS_WECAHT_MINI_ACCESS_TOKEN_KEY); accessToken = getMiniAccessToken(); url = StrUtil.format(WeChatConstants.WECHAT_MINI_SEND_SUBSCRIBE_URL, accessToken); result = restTemplateUtil.postJsonData(url, messAge); JSONObject data2 = JSONObject.parseObject(result); - if (data2.containsKey("errcode") && !data2.getString("errcode").equals("0")) { + if (data2.containsKey("errcode") && !"0".equals(data2.getString("errcode"))) { if (data2.containsKey("errmsg")) { wxExceptionDispose(data2, "微信小程序发送订阅消息重试异常"); throw new CrmebException("微信接口调用失败：" + data2.getString("errcode") + data2.getString("errmsg")); @@ -479,7 +479,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(result)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (result.containsKey("errcode") && result.getString("errcode").equals("0")) { + if (result.containsKey("errcode") && "0".equals(result.getString("errcode"))) { return result; } if (result.containsKey("errmsg")) { @@ -504,7 +504,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(jsonObject)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (jsonObject.containsKey("errcode") && jsonObject.getString("errcode").equals("0")) { + if (jsonObject.containsKey("errcode") && "0".equals(jsonObject.getString("errcode"))) { return Boolean.TRUE; } if (jsonObject.containsKey("errmsg")) { @@ -526,7 +526,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(result)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (result.containsKey("errcode") && result.getString("errcode").equals("0")) { + if (result.containsKey("errcode") && "0".equals(result.getString("errcode"))) { return Boolean.TRUE; } if (result.containsKey("errmsg")) { @@ -571,12 +571,12 @@ public class WechatNewServiceImpl implements WechatNewService { } WxRefundResponseVo responseVo = CrmebUtil.mapToObj(map, WxRefundResponseVo.class); - if (responseVo.getReturnCode().toUpperCase().equals("FAIL")) { + if ("FAIL".equals(responseVo.getReturnCode().toUpperCase())) { wxPayExceptionDispose(map, "微信申请退款异常1"); throw new CrmebException("微信申请退款失败1！" + responseVo.getReturnMsg()); } - if (responseVo.getResultCode().toUpperCase().equals("FAIL")) { + if ("FAIL".equals(responseVo.getResultCode().toUpperCase())) { wxPayExceptionDispose(map, "微信申请退款业务异常"); throw new CrmebException("微信申请退款失败2！" + responseVo.getErrCodeDes()); } @@ -596,7 +596,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(jsonObject)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (jsonObject.containsKey("errcode") && !jsonObject.getString("errcode").equals("0")) { + if (jsonObject.containsKey("errcode") && !"0".equals(jsonObject.getString("errcode"))) { if (jsonObject.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(jsonObject, StrUtil.format("获取我的公众号模板消息列表异常")); @@ -625,7 +625,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { + if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { if (data.containsKey("errmsg")) { wxExceptionDispose(data, "删除微信公众号模板消息异常"); throw new CrmebException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg")); @@ -651,7 +651,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { + if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { if (data.containsKey("errmsg")) { wxExceptionDispose(data, "添加公众号模板消息异常"); throw new CrmebException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg")); @@ -672,7 +672,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(jsonObject)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (jsonObject.containsKey("errcode") && !jsonObject.getString("errcode").equals("0")) { + if (jsonObject.containsKey("errcode") && !"0".equals(jsonObject.getString("errcode"))) { if (jsonObject.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(jsonObject, StrUtil.format("获取小程序当前帐号下的个人模板列表异常")); @@ -700,7 +700,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { + if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { if (data.containsKey("errmsg")) { wxExceptionDispose(data, "删除微信小程序订阅消息异常"); throw new CrmebException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg")); @@ -722,7 +722,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(jsonObject)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (jsonObject.containsKey("errcode") && !jsonObject.getString("errcode").equals("0")) { + if (jsonObject.containsKey("errcode") && !"0".equals(jsonObject.getString("errcode"))) { if (jsonObject.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(jsonObject, "获取小程序平台上的标准模板异常"); @@ -754,7 +754,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { + if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { if (data.containsKey("errmsg")) { wxExceptionDispose(data, "添加小程序订阅消息异常"); throw new CrmebException("微信接口调用失败：" + data.getString("errcode") + data.getString("errmsg")); @@ -794,7 +794,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { + if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { if (data.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(data, "微信获取JS-SDK的ticket异常"); @@ -819,7 +819,7 @@ public class WechatNewServiceImpl implements WechatNewService { if (ObjectUtil.isNull(data)) { throw new CrmebException("微信平台接口异常，没任何数据返回！"); } - if (data.containsKey("errcode") && !data.getString("errcode").equals("0")) { + if (data.containsKey("errcode") && !"0".equals(data.getString("errcode"))) { if (data.containsKey("errmsg")) { // 保存到微信异常表 wxExceptionDispose(data, StrUtil.format("微信获取accessToken异常，{}端", type)); @@ -853,7 +853,7 @@ public class WechatNewServiceImpl implements WechatNewService { private void wxPayExceptionDispose(HashMap map, String remark) { WechatExceptions wechatExceptions = new WechatExceptions(); String returnCode = (String) map.get("return_code"); - if (returnCode.toUpperCase().equals("FAIL")) { + if ("FAIL".equals(returnCode.toUpperCase())) { wechatExceptions.setErrcode("-100"); wechatExceptions.setErrmsg(map.get("return_msg").toString()); } else { @@ -874,13 +874,13 @@ public class WechatNewServiceImpl implements WechatNewService { */ private void wxPayQueryExceptionDispose(MyRecord record, String remark) { WechatExceptions wechatExceptions = new WechatExceptions(); - if (record.getStr("return_code").toUpperCase().equals("FAIL")) { + if ("FAIL".equals(record.getStr("return_code").toUpperCase())) { wechatExceptions.setErrcode("-200"); wechatExceptions.setErrmsg(record.getStr("return_msg")); - } else if (record.getStr("result_code").toUpperCase().equals("FAIL")) { + } else if ("FAIL".equals(record.getStr("result_code").toUpperCase())) { wechatExceptions.setErrcode(record.getStr("err_code")); wechatExceptions.setErrmsg(record.getStr("err_code_des")); - } else if (!record.getStr("trade_state").toUpperCase().equals("SUCCESS")) { + } else if (!"SUCCESS".equals(record.getStr("trade_state").toUpperCase())) { wechatExceptions.setErrcode("-201"); wechatExceptions.setErrmsg(record.getStr("trade_state")); } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPublicServiceImpl.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPublicServiceImpl.java index 814ac768..51f7b7f0 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPublicServiceImpl.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/service/impl/WechatPublicServiceImpl.java @@ -36,7 +36,7 @@ public class WechatPublicServiceImpl implements WechatPublicService { @Override public Object getCustomizeMenus() { Object list = redisUtil.get(WeChatConstants.REDIS_PUBLIC_MENU_KEY); - if (list == null || list.equals("")) { + if (list == null || "".equals(list)) { //如果没有， 去读取 JSONObject tagsList = wechatNewService.getPublicCustomMenu(); redisUtil.set(WeChatConstants.REDIS_PUBLIC_MENU_KEY, tagsList); diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/RequestMethod.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/RequestMethod.java index b23306c6..c7d99ff6 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/RequestMethod.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/RequestMethod.java @@ -24,13 +24,13 @@ public class RequestMethod { } private static boolean CCIsNull(String client_id, String client_secret) { - if (ClientId != null && ClientSecret != null && !ClientId.equals("") && !ClientSecret.equals("")) + if (ClientId != null && ClientSecret != null && !"".equals(ClientId) && !"".equals(ClientSecret)) return true; return false; } public String getCodeOpen(String redirect_uri) { - if (ClientId != null && !ClientId.equals("")) + if (ClientId != null && !"".equals(ClientId)) return UtilUrl.openType + "?response_type=code&client_id=" + ClientId + "&redirect_uri=" + redirect_uri + "&state=1"; return example; } diff --git a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/Utils.java b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/Utils.java index e66ae544..5878f46b 100644 --- a/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/Utils.java +++ b/crmeb/crmeb-service/src/main/java/com/zbkj/service/util/yly/Utils.java @@ -29,7 +29,7 @@ public class Utils { } public static boolean isNull(String content) { - if (content != null && !content.equals("")) + if (content != null && !"".equals(content)) return false; return true; } -- Gitee