123

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/process/ResultCode.java

@@ -45,6 +45,9 @@ public class ResultCode {
 
 	public static int ORDER_NOT_EXIST = Integer.valueOf(SystemProperty.getResultConfig("ORDER_NOT_EXIST"));
 
+	public static int ORDER_GOODS_EXIST = Integer.valueOf(SystemProperty.getResultConfig("ORDER_GOODS_EXIST"));
+
+
 	public static int GET_AUTH_INFO_FAILED_CODE = Integer.valueOf(SystemProperty.getResultConfig("GET_AUTH_INFO_FAILED_CODE"));
 
 	public static int WRONG_FORMAT_OF_ID_CARD = Integer.valueOf(SystemProperty.getResultConfig("WRONG_FORMAT_OF_ID_CARD"));

ace-common/src/main/resources/properties/resultcod.properties

@@ -75,6 +75,11 @@ INCOMPLETE_DATA=4006
 ORDER_NOT_EXIST = 20001
 20001 = 该订单不存在
 
+ORDER_GOODS_EXIST = 20002
+20002 = 购物车商品已存在
+
+
+
 #参数时效已过时
 PARAM_EXPIRE_CODE=1010
 1010=参数时效已过时，不能使用
@@ -86,3 +91,4 @@ GET_APPUSER_FAILED_CODE=4003
 #手机号已绑定微信
 WX_BIND_CODE=4002
 4002=手机号已绑定微信
+

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java

@@ -58,9 +58,6 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
 		PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
 		List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
 		PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
-		if (pageInfo.getList() == null || pageInfo.getList().size() == 0) {
-			return new PageInfo<>();
-		}
 		return pageInfo;
 	}
 

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ShoppingCartInfoBiz.java

@@ -123,7 +123,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
 				ImageDataVO imageDataVO = imageDataVOList.get(0);
 				ShoppingCartInfo old = selectByUser(appUserDTO.getUserid(), Long.valueOf(imageDataVO.getId()));
 				if (old != null) {
-					return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "商品不能重复添加购物车！");
+					return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
 				} else {
 					ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
 					shoppingCartInfo.setDetailId(Long.valueOf(imageDataVO.getId()));
@@ -152,7 +152,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
 			if (imageImgStorage != null) {
 				ShoppingCartInfo old = selectByUser(appUserDTO.getUserid(), Long.valueOf(imageImgStorage.getId()));
 				if (old != null) {
-					return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "商品不能重复添加购物车！");
+					return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
 				} else {
 					ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
 					shoppingCartInfo.setDetailId(Long.valueOf(imageImgStorage.getId()));
@@ -183,7 +183,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
 			if (industryApplicationInfo != null) {
 				ShoppingCartInfo old = selectByUser(appUserDTO.getUserid(), Long.valueOf(industryApplicationInfo.getId()));
 				if (old != null) {
-					return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "商品不能重复添加购物车！");
+					return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
 				} else {
 					ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
 					shoppingCartInfo.setDetailId(Long.valueOf(industryApplicationInfo.getId()));