anderx лет назад: 7
Родитель
Сommit
f2252414ab

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

@@ -280,7 +280,7 @@ public class AppOrderController extends CertifyApiController{
 	/**
 	 * 新增评价
 	 */
-	@RequestMapping(value = "/apply", method = RequestMethod.POST)
+	@RequestMapping(value = "/applyComment", method = RequestMethod.POST)
 	public Result addNewComment(HttpServletRequest request,CommentInput commentInput) {
 		Result result=new Result();
 		String ip=UserCommentController.getClientIp(request);

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

@@ -609,7 +609,7 @@ public class AppUserController extends BaseApiController {
 	 * userType-----0-购买者   1-出售者  2-管理员
 	 * 
 	 * */
-	@RequestMapping(value="/list",method = RequestMethod.GET)
+	@RequestMapping(value="/orderList",method = RequestMethod.GET)
 	public Result getMyJtOrderList(Integer orderType,Integer userType,Integer pageNo,Integer pageSize) {
 		Result result=new Result();
 		if(userType==null || userType>1 || userType<0) { 

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

@@ -257,6 +257,22 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/admin/userOrder");
 		return modelview;
 	}
+	
+	@RequestMapping(value = "portal/continueHigh", method = RequestMethod.GET)
+	public ModelAndView portalContinueHigh(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("portal/continueHigh");
+		return modelview;
+	}
+	@RequestMapping(value = "portal/militaryProject", method = RequestMethod.GET)
+	public ModelAndView portalMilitaryProject(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("portal/militaryProject");
+		return modelview;
+	}
+	@RequestMapping(value = "portal/practicalPatent", method = RequestMethod.GET)
+	public ModelAndView portalPracticalPatent(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("portal/practicalPatent");
+		return modelview;
+	}
 
 	@RequestMapping(value = "/admin/order", method = RequestMethod.GET)
 	public ModelAndView adminOrder(HttpServletRequest request, ModelAndView modelview) {

+ 4 - 4
src/main/java/com/goafanti/common/mapper/JtOrderMapper.xml

@@ -428,11 +428,11 @@
   <select id="searchJtOrderList" resultType="com.goafanti.order.bo.JtOrderResultDetail">
   select 
   jto.order_no as orderNo,
-  jtod.commodity_type as commodityType,
+ jtod.commodity_type as commodityType,
   jto.order_time as createTime,
   jto.order_amount as orderAmount,
+  jtod.commodity_quantity as commodityQuantity, 
   jtod.commodity_name as commodityName,
-  jtod.commodity_id as commodityId,
   jto.seller_id as sellerId,
   jto.buyer_id as buyerId,
   seller.identify_name as sellerName,
@@ -443,7 +443,7 @@
   from jt_order jto
   left join jt_order_detail jtod on jtod.order_no=jto.order_no
   left join user seller on seller.id = jto.seller_id
-  left join user buyer on  buyer.id=jto.buyer_id
+  left join user buyer on  buyer.id=jto.buyer_id 
   where 1=1
   <if test="sellerId!=null">
   and jto.seller_id=#{sellerId,jdbcType=VARCHAR}
@@ -478,7 +478,7 @@
 		</if>
   </select>
   
-    <select id="searchJtOrderListCount" resultType="java.lang.Integer">
+   <select id="searchJtOrderListCount" resultType="java.lang.Integer">
   select 
 count(0)
  from jt_order jto

+ 7 - 0
src/main/java/com/goafanti/order/bo/JtOrderResultDetail.java

@@ -17,6 +17,7 @@ public class JtOrderResultDetail {
 	private String buyerMobile;
 	private String commodityId;
 	private String ImgUrl;
+	private	String commodityQuantity;
 	
 	public String getCommodityId() {
 		return commodityId;
@@ -96,6 +97,12 @@ public class JtOrderResultDetail {
 	public void setImgUrl(String imgUrl) {
 		ImgUrl = imgUrl;
 	}
+	public String getCommodityQuantity() {
+		return commodityQuantity;
+	}
+	public void setCommodityQuantity(String commodityQuantity) {
+		this.commodityQuantity = commodityQuantity;
+	}
 	
 
 }

+ 5 - 7
src/main/java/com/goafanti/order/service/impl/JtOrderServiceImpl.java

@@ -10,7 +10,6 @@ import java.util.UUID;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.context.request.NativeWebRequest;
 
 import com.goafanti.business.bo.JtBusinessProjectResult;
 import com.goafanti.common.dao.AchievementMapper;
@@ -27,7 +26,6 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.news.bo.newsInterestBo;
 import com.goafanti.order.bo.JtOrderInput.JtSingleOrder;
 import com.goafanti.order.bo.JtOrderResultDetail;
 import com.goafanti.order.service.JtOrderService;
@@ -183,7 +181,7 @@ public class JtOrderServiceImpl extends BaseMybatisDao<JtOrderMapper> implements
 		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);
+		if(orderType!=null  && ((orderType>=0 && orderType<=6)|| orderType==10))params.put("orderType", orderType);
 			return (Pagination<JtOrderResultDetail>) findPage("searchJtOrderList", "searchJtOrderListCount", params, pageNo, pageSize);
 	}
 	
@@ -199,18 +197,18 @@ public class JtOrderServiceImpl extends BaseMybatisDao<JtOrderMapper> implements
 		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进行搜索
 			params.put("buyerId", TokenManager.getUserId());
+//			params.put("buyerId", "1");
 		}
 		else if(userType==1) {
 			//出售者  将卖家姓名置空,出售者id为当前id进行搜索
 			params.put("sellerId", TokenManager.getUserId());
 		}
-		if(orderType!=null  && ((orderType>=0 && orderType<=3)|| orderType==10))params.put("orderType", orderType);
-		Pagination<JtOrderResultDetail>p=(Pagination<JtOrderResultDetail>) findPage("SearchJtOrderList", "AearchJtOrderListCount", params, pageNo, pageSize);
+		if(orderType!=null && ((orderType>=0 && orderType<=6)|| orderType==10))params.put("orderType", orderType);
+		Pagination<JtOrderResultDetail>p = (Pagination<JtOrderResultDetail>) findPage("searchJtOrderList", "searchJtOrderListCount", params, pageNo, pageSize);
 		List<JtOrderResultDetail> l=(List<JtOrderResultDetail>) p.getList();
 				for (JtOrderResultDetail j : l) {
 					if (null!=j.getCommodityType()) {

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/continueHigh.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/militaryProject.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/practicalPatent.html