From 3d0b7b13c16b1b6bcc2164ccbcf21b023937ca44 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 10 Aug 2019 20:25:45 +0800 Subject: [PATCH] =?UTF-8?q?[C][=E4=BF=AE=E6=94=B9]:c=E7=AB=AF=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCardPayController.java | 7 ++++--- .../iformall/controller/WxCouponController.java | 3 ++- .../controller/WxCouponOrderController.java | 8 +++++--- .../com/iformall/controller/WxOrderController.java | 14 ++++++++++++-- .../src/main/java/com/iformall/utils/Constant.java | 2 ++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 95f061e5f..97e975d12 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -9,6 +9,7 @@ import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.enums.EnumMerchantStatus; import com.iformall.exception.MallinkException; import com.iformall.service.*; +import com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -57,15 +58,15 @@ public class WxCardPayController extends BaseController { String merchantStr = paramMap.get("merchantId"); String totalFeeStr = paramMap.get("totalFee"); - if (StringUtils.isBlank(cardIdStr)) { + if (StringUtils.isBlank(cardIdStr) || cardIdStr.equalsIgnoreCase(Constant.UNDEFINED)) { logger.error("cardId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cardId不能为空"); } - if (StringUtils.isBlank(merchantStr)) { + if (StringUtils.isBlank(merchantStr) || merchantStr.equalsIgnoreCase(Constant.UNDEFINED)) { logger.error("merchantId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "merchantId不能为空"); } - if (StringUtils.isBlank(totalFeeStr)) { + if (StringUtils.isBlank(totalFeeStr) || totalFeeStr.equalsIgnoreCase(Constant.UNDEFINED)) { logger.error("totalFee不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "totalFee不能为空"); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 957c66d08..9dd32a89b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -8,6 +8,7 @@ import com.iformall.enums.EnumCouponChannelActivityStatus; import com.iformall.enums.EnumCouponChannelType; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; +import com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -37,7 +38,7 @@ public class WxCouponController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "couponChannelId", value = "couponChannelId", dataType = "String", paramType = "query", required = true)}) public ResultData detailC(String couponChannelId) { - if (StringUtils.isBlank(couponChannelId)) { + if (StringUtils.isBlank(couponChannelId) || couponChannelId.equalsIgnoreCase(Constant.UNDEFINED)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId为空"); } Long couponChannelIdL = 0L; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 1889fafd1..487c431f0 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -11,6 +11,7 @@ import com.iformall.enums.EnumCouponChannelActivityStatus; import com.iformall.enums.EnumCouponOrderStatus; import com.iformall.enums.EnumCouponOrderValidStatus; import com.iformall.service.WxCouponOrderService; +import com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -81,9 +82,10 @@ public class WxCouponOrderController extends BaseController { }) public ResultData detail(String couponOrderId) { - if (couponOrderId == null) { + if (couponOrderId == null || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } + WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(couponOrderId); if (wxCouponOrderCVo == null) { @@ -114,7 +116,7 @@ public class WxCouponOrderController extends BaseController { }) public ResultData getStatus(String couponOrderId) { - if (couponOrderId == null) { + if (couponOrderId == null || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } @@ -166,7 +168,7 @@ public class WxCouponOrderController extends BaseController { }) public ResultData cardDetail(String couponOrderId) { - if (couponOrderId == null) { + if (couponOrderId == null || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED) ) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index cdb4fb1fc..2eef41fd1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -16,6 +16,7 @@ import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; import com.iformall.service.WxOrderService; +import com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -153,7 +154,7 @@ public class WxOrderController extends BaseController { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); String orderIdStr = paramMap.get("orderId"); - if (StringUtils.isBlank(orderIdStr)) { + if (StringUtils.isBlank(orderIdStr) || orderIdStr.equalsIgnoreCase(Constant.UNDEFINED)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); } Long orderId = 0L; @@ -182,7 +183,7 @@ public class WxOrderController extends BaseController { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); String orderIdStr = paramMap.get("orderId"); - if (StringUtils.isBlank(orderIdStr)) { + if (StringUtils.isBlank(orderIdStr) || orderIdStr.equalsIgnoreCase(Constant.UNDEFINED)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "退款订单ID不能为空"); } Long orderId = 0L; @@ -240,6 +241,9 @@ public class WxOrderController extends BaseController { @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "String", paramType = "query", required = true) }) public ResultData detail(String orderId) { + if (StringUtils.isBlank(orderId) || orderId.equalsIgnoreCase(Constant.UNDEFINED)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } // c端用户应该只能看到自己的订单细节 WxOrder wxOrder = new WxOrder(); Long id = 0L; @@ -276,6 +280,9 @@ public class WxOrderController extends BaseController { @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "String", paramType = "query", required = true) }) public ResultData findById(String orderId) { + if (orderId == null || orderId.equalsIgnoreCase(Constant.UNDEFINED)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } Long id = 0L; try { id = Long.valueOf(orderId); @@ -303,6 +310,9 @@ public class WxOrderController extends BaseController { @ApiImplicitParam(name = "couponId", value = "券id", dataType = "String", paramType = "query", required = true) }) public ResultData getUnPaidOrder(String couponId) { + if (couponId == null || couponId.equalsIgnoreCase(Constant.UNDEFINED)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } Long id = 0L; try { id = Long.valueOf(couponId); diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index e6b5ac894..8daefc128 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -27,6 +27,8 @@ public class Constant { // 获取mall信息 public static final String MALL_KEY_PREV = "mall:"; + public static final String UNDEFINED = "undefined"; + public static final String importMemPrev = "importmem:"; public static final String adminPage = "https://admin.malls.iformall.com"; }