Selaa lähdekoodia

技淘网页、个人中心、运营中心BUG修复与优化

anderx 7 vuotta sitten
vanhempi
commit
50f35ea23f

+ 51 - 0
src/main/java/com/goafanti/app/controller/AppOrderController.java

@@ -4,16 +4,21 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.goafanti.comment.bo.CommentInput;
+import com.goafanti.comment.controller.UserCommentController;
+import com.goafanti.comment.service.CommentService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.order.enums.CommodityType;
+import com.goafanti.order.service.JtOrderService;
 import com.goafanti.order.service.OrderService;
 
 @RestController
@@ -22,6 +27,10 @@ public class AppOrderController extends CertifyApiController{
 	
 	@Resource
 	private OrderService orderServiceImpl;
+	@Resource
+	private CommentService	commentService;
+	@Resource
+	private JtOrderService	jtOrderService;
 	/**
 	 * 进入添加意向订单
 	 * @param commodityId 商品编号
@@ -253,4 +262,46 @@ public class AppOrderController extends CertifyApiController{
 		orderServiceImpl.updateConfirmRefund(orderNo,confirm);
 		return res;
 	}
+	/*
+	 * userType-----0-购买者   1-出售者  2-管理员
+	 * 
+	 * */
+	@RequestMapping(value="/list",method = RequestMethod.GET)
+	public Result getMyJtOrderList(Integer orderType,String orderNo,String startCreateDate,String endCreateDate,String sellerName,String buyerName,String commodityName,Integer userType,Integer pageNo,Integer pageSize) {
+		Result result=new Result();
+		if(userType==null || userType>1 || userType<0) { 
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","用户类型错误"));
+			return result;
+		}
+		
+		result.setData(jtOrderService.searchOrderList(orderType,orderNo, startCreateDate, endCreateDate, sellerName, buyerName, commodityName, userType, pageNo, pageSize)); 
+		return result;
+	}
+	/**
+	 * 新增评价
+	 */
+	@RequestMapping(value = "/apply", method = RequestMethod.POST)
+	public Result addNewComment(HttpServletRequest request,CommentInput commentInput) {
+		Result result=new Result();
+		String ip=UserCommentController.getClientIp(request);
+		if(StringUtils.isBlank(commentInput.getCommodityId())) {
+			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"商品id为空","商品id"));return result;
+		}
+		if(commentInput.getStar()==null || commentInput.getStar()<0 || commentInput.getStar()>5) {
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","评分"));return result;
+		}
+		if(StringUtils.isBlank(commentInput.getOrderNo())) {
+			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));return result;
+		}
+		if(StringUtils.isBlank(commentInput.getContent()) || commentInput.getContent().length()>512) {
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","内容限制1-512字符"));return result;
+		}
+		int res=commentService.addNewComment(commentInput,ip);
+		if(res ==-1) {
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","提交失败"));return result;
+		}
+		result.setData(res);
+		
+		return result;
+	}
 }

+ 24 - 12
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -562,10 +562,15 @@ public class AppUserController extends BaseApiController {
 			return res().error(buildError("user only", "必须是登录会员才能访问。"));
 		}
 	}
-	
+	/**
+	 * 修改密码
+	 * @param newPwd
+	 * @param pwd
+	 * @return
+	 */
 	@RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
 	@ResponseBody
-	public Result resetPassword(String userName,String newPwd,String pwd) {
+	public Result resetPassword(String newPwd,String pwd) {
 		Result res=new Result();
 		if(null == TokenManager.getSession().getAttribute(VerifyCodeUtils.RESET_CODE)){
 			res.getError().add(buildError(ErrorConstants.RESET_CODE_OVERTIME, "", "页面超时失效,请重新获取!"));
@@ -576,24 +581,31 @@ public class AppUserController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新密码"));
 			return res;
 		}
-		if (StringUtils.isBlank(userName)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户名"));
-			return res;
+		if (res.getError().isEmpty() && TokenManager.isLogin()) {
+			User u = new User();
+			User user = userService.selectByPrimaryKey(TokenManager.getUserId());
+			u.setId(user.getId());
+			u.setCreateTime(user.getCreateTime());
+			u.setPassword(newPwd);
+			u.setPassword(passwordUtil.getEncryptPwd(u));
+			if (!user.getPassword().equals(passwordUtil.getEncryptPwd(newPwd, user.getCreateTime()))) {
+				res.getError().add(buildError(ErrorConstants.PWD_NOT_MATCH_ERROR));
+			} else {
+				res.setData(userService.updateByPrimaryKeySelective(u));
+			}
 		}
-		User user=userService.selectByNameAndType(userName, null);
-		user.setPassword(newPwd);
-		user.setPassword(passwordUtil.getEncryptPwd(user));
-		userService.updateByPrimaryKeySelective(user);
 		return res;
 		
 	}
+	
 	private void cleanCodeSession() {
 		VerifyCodeUtils.clearResetCode();
 		VerifyCodeUtils.clearResetCodeTime();
 		VerifyCodeUtils.clearMobileCode();
 		VerifyCodeUtils.clearMobileCodeTime();
 	}
-	/*
+	
+	/*APP订单列表
 	 * userType-----0-购买者   1-出售者  2-管理员
 	 * 
 	 * */
@@ -604,8 +616,8 @@ public class AppUserController extends BaseApiController {
 			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","用户类型错误"));
 			return result;
 		}
-		
-		result.setData(jtOrderService.searchOrderList(orderType,orderNo, startCreateDate, endCreateDate, sellerName, buyerName, commodityName, userType, pageNo, pageSize)); 
+		result.setData(jtOrderService.appSearchOrderList(orderType,orderNo, startCreateDate, endCreateDate, sellerName, buyerName, commodityName, userType, pageNo, pageSize)); 
 		return result;
 	}
+	
 }

+ 2 - 2
src/main/java/com/goafanti/comment/controller/UserCommentController.java

@@ -33,7 +33,7 @@ public class UserCommentController extends BaseApiController{
 	@RequestMapping(value = "/apply", method = RequestMethod.POST)
 	public Result addNewComment(HttpServletRequest request,CommentInput commentInput) {
 		Result result=new Result();
-		String ip=getClientIp(request);
+		String ip=UserCommentController.getClientIp(request);
 		if(StringUtils.isBlank(commentInput.getCommodityId())) {
 			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"商品id为空","商品id"));return result;
 		}
@@ -71,7 +71,7 @@ public class UserCommentController extends BaseApiController{
 		return result;
 		
 	}
-	private static String getClientIp(HttpServletRequest request) {
+	public static String getClientIp(HttpServletRequest request) {
 		 String ip = request.getHeader("x-forwarded-for"); 
 	       if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { 
 	           ip = request.getHeader("Proxy-Client-IP"); 

+ 2 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -407,7 +407,7 @@ public class WebpageController extends BaseController {
 	 * */
 	@RequestMapping(value = "/portal/service/patentDetail", method = RequestMethod.GET)
 	public ModelAndView portalServicePatentDetail(HttpServletRequest request, ModelAndView modelview,String id) {
-	modelview.setViewName("/portal/service/serviceDetails");
+	modelview.setViewName("/portal/service/patenteDetails");
 	JtBusinessProject jtBusinessProject=jtBusinessService.getBusinessProjectDetail(id);
 	if(jtBusinessProject!=null) {
 		if(jtBusinessProject.getMaxImgUrl()!=null && jtBusinessProject.getMaxImgUrl().length()<=0)jtBusinessProject.setMaxImgUrl(null);
@@ -1049,7 +1049,7 @@ public class WebpageController extends BaseController {
 					if (StringUtils.isNumeric(pageSize)) {
 						pSize = Integer.parseInt(pageSize);
 					}
-					res.setData(newsService.portalNewsList(pSize, pNo, type, hot, provinceId, keyword,null));
+					res.setData(newsService.portalNewsList(pSize, pNo, type, hot, provinceId, keyword,2));
 					return res;
 				}
 

+ 2 - 1
src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml

@@ -56,7 +56,7 @@
 		limit #{pageNo,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER}
 	</select>
 	
-	<select id="findNewsListByPage" parameterType="String" resultMap="BaseResultMap">
+	<select id="findNewsListByPage" parameterType="String" resultType="com.goafanti.common.model.News">
   	select
   		n.id,
   		n.create_time,
@@ -70,6 +70,7 @@
   		n.release_status as releaseStatus,
   		n.top_number as topNumber,
     	n.hotspot,
+    	n.source_url as sourceUrl,
     	n.release_date as releaseDate
   	from news n
   	<if test="publishPage !=null">

+ 2 - 2
src/main/java/com/goafanti/common/utils/LimitLengthUtil.java

@@ -101,10 +101,10 @@ public class LimitLengthUtil {
  {
 	 int truelyQueryLength=Math.min(list.size(), queryLength);
 	 count=Math.min(count, truelyQueryLength);
-	 if(list==null || list.size()<=0)return list;
-	 int[] randomInts=RandomUtil.generateRandomList(truelyQueryLength, count);
+	 if(list==null || list.size()<=1)return list;
 	 if(list==null || list.size()<=count)return list;
 	 else {
+		 int[] randomInts=RandomUtil.generateRandomList(truelyQueryLength, count);
 		 List<T>res=new ArrayList<>();
 		 for(int i=0;i<count;i++) {
 			 res.add(list.get(randomInts[i]));

+ 19 - 13
src/main/java/com/goafanti/common/utils/RandomUtil.java

@@ -9,20 +9,26 @@ public class RandomUtil {
 
 		boolean flag = false;
 		int randInt = 0;
-		for (int i = 0; i < count; i++) {
-			res[i]=-1;
-			do {
-				randInt = rand.nextInt(maxNum);
-				for (int i1 = 0; i1 < count; i1++) {
-					if (res[i1] == randInt) {
-						flag = false;
-						break;
+		if(maxNum < count){
+			for (int i = 0; i < count; i++) {
+				res[i] = i;
+			}
+		}else {
+			for (int i = 0; i < count; i++) {
+				res[i]=-1;
+				do {
+					randInt = rand.nextInt(maxNum);
+					for (int i1 = 0; i1 < count; i1++) {
+						if (res[i1] == randInt) {
+							flag = false;
+							break;
+						}
+						flag=true;
 					}
-					flag=true;
-				}
-			} while (!flag);
-			flag = false;
-			res[i] = randInt;
+				} while (!flag);
+				flag = false;
+				res[i] = randInt;
+			}
 		}
 		return res;
 	}

+ 1 - 1
src/main/java/com/goafanti/order/controller/UserJtOrderController.java

@@ -20,7 +20,7 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
 @RestController
-@RequestMapping(value = "/open/api/user/jtOrder")
+@RequestMapping(value = "/api/user/jtOrder")
 public class UserJtOrderController extends BaseApiController {
 	@Resource
 	JtOrderService jtOrderService;

+ 4 - 0
src/main/java/com/goafanti/order/service/JtOrderService.java

@@ -12,4 +12,8 @@ public interface JtOrderService {
 	
 	Pagination<JtOrderResultDetail>searchOrderList(Integer orderType,String orderNo,String startCreateDate,String endCreateDate,String sellerName,String buyerName,String commodityName,Integer userType,Integer pageNo,Integer pageSize);
 
+	Pagination<JtOrderResultDetail> appSearchOrderList(Integer orderType, String orderNo, String startCreateDate, String endCreateDate,
+			String sellerName, String buyerName, String commodityName, Integer userType, Integer pageNo,
+			Integer pageSize);
+
 }

+ 37 - 0
src/main/java/com/goafanti/order/service/impl/JtOrderServiceImpl.java

@@ -188,5 +188,42 @@ public class JtOrderServiceImpl extends BaseMybatisDao<JtOrderMapper> implements
 	}
 	
 	
+	
+	/*
+	 * userType-----0-购买者   1-出售者  2-管理员
+	 * 
+	 * */
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<JtOrderResultDetail> appSearchOrderList(Integer orderType ,String orderNo, String startCreateDate, String endCreateDate,
+			String sellerName, String buyerName, String commodityName, Integer userType,Integer pageNo,Integer pageSize) {
+		Map<String, Object>params=new HashMap<>();
+		if(pageNo==null ||pageNo<1)pageNo=1;
+		if(pageSize==null || pageSize<1)pageSize=10;
+		String sellerId=null;
+		String buyerId=null;
+		if(userType==0) {
+			//购买者 将买家姓名置空,购买id为当前id进行搜索
+			buyerName=null;
+			buyerId=TokenManager.getUserId();
+			params.put("buyerId", buyerId);
+		}
+		else if(userType==1) {
+			//出售者  将卖家姓名置空,出售者id为当前id进行搜索
+			sellerName=null;
+			sellerId=TokenManager.getUserId();
+			params.put("sellerId", sellerId);
+		}
+		
+		if(buyerName!=null)params.put("buyerName", buyerName);
+		if(sellerName!=null)params.put("sellerName", sellerName);
+		if(orderNo!=null)params.put("orderNo", orderNo);
+		if(startCreateDate!=null)params.put("startCreateDate", startCreateDate);
+		if(endCreateDate!=null)params.put("endCreateDate", endCreateDate);
+		if(commodityName!=null)params.put("commodityName", commodityName);
+		if(orderType!=null  && ((orderType>=0 && orderType<=3)|| orderType==10))params.put("orderType", orderType);
+			return (Pagination<JtOrderResultDetail>) findPage("searchJtOrderList", "searchJtOrderListCount", params, pageNo, pageSize);
+	}
+	
 
 }