Просмотр исходного кода

修改字符串equals判断写法

suntg 8 лет назад
Родитель
Сommit
f036702d7d

+ 6 - 5
src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsController.java

@@ -95,9 +95,9 @@ public class GoodsController {
 		PageInfo info = new PageInfo(params);
 		PageInfo info = new PageInfo(params);
 		Long enUU = SystemSession.getUser().getEnterprise().getUu();
 		Long enUU = SystemSession.getUser().getEnterprise().getUu();
 		info.filter("enUU", enUU);
 		info.filter("enUU", enUU);
-		if (status.equals("AVAILABLE")) {
+		if ("AVAILABLE".equals(status)) {
 			info.filter("status", Status.AVAILABLE.value());
 			info.filter("status", Status.AVAILABLE.value());
-		} else if (status.equals("UNAVAILABLE")) {
+		} else if ("UNAVAILABLE".equals(status)) {
 			info.filter("status", Status.UNAVAILABLE.value());
 			info.filter("status", Status.UNAVAILABLE.value());
 		}
 		}
 		Page<Goods> page = goodsService.findPageByStatus(info, keyword);
 		Page<Goods> page = goodsService.findPageByStatus(info, keyword);
@@ -116,9 +116,9 @@ public class GoodsController {
     @RequestMapping(value = "/saling/admin", method = RequestMethod.GET)
     @RequestMapping(value = "/saling/admin", method = RequestMethod.GET)
 	public Page<Goods> findSalingGoodsAdmin(PageParams params, String status, String keyword) {
 	public Page<Goods> findSalingGoodsAdmin(PageParams params, String status, String keyword) {
 		PageInfo info = new PageInfo(params);
 		PageInfo info = new PageInfo(params);
-		if (status.equals("AVAILABLE")) {
+		if ("AVAILABLE".equals(status)) {
 			info.filter("status", Status.AVAILABLE.value());
 			info.filter("status", Status.AVAILABLE.value());
-		} else if (status.equals("UNAVAILABLE")) {
+		} else if ("UNAVAILABLE".equals(status)) {
 			info.filter("status", Status.UNAVAILABLE.value());
 			info.filter("status", Status.UNAVAILABLE.value());
 		}
 		}
 		Page<Goods> page = goodsService.findPageByStatus(info, keyword);
 		Page<Goods> page = goodsService.findPageByStatus(info, keyword);
@@ -214,7 +214,8 @@ public class GoodsController {
     @RequestMapping(value = "/simple/byUuidAndCurrency", method = RequestMethod.GET, params = "_status=available")
     @RequestMapping(value = "/simple/byUuidAndCurrency", method = RequestMethod.GET, params = "_status=available")
 	@ResponseBody
 	@ResponseBody
 	public List<GoodsSimple> findSimpleAvailableByUuid(String uuid, String currencyName) {
 	public List<GoodsSimple> findSimpleAvailableByUuid(String uuid, String currencyName) {
-		if (StringUtils.isEmpty(currencyName) || "without".equals(currencyName)) {// 不进行币别筛选
+		// 不进行币别筛选
+		if (StringUtils.isEmpty(currencyName) || "without".equals(currencyName)) {
 			logger.log("商品批次", "根据商品uuid获取有效的商品批次", "uuid: " + uuid);
 			logger.log("商品批次", "根据商品uuid获取有效的商品批次", "uuid: " + uuid);
 			return goodsService.findSimpleAvailableByUuid(uuid);
 			return goodsService.findSimpleAvailableByUuid(uuid);
 		} else {
 		} else {