Bläddra i källkod

技淘BUG修复与优化

anderx 7 år sedan
förälder
incheckning
24c68d5c6b

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

@@ -226,6 +226,7 @@ public class AppUserController extends BaseApiController {
 		bo.setMessageId(mfs.getId());
 		bo.setTitle(mfs.getTitle());
 		bo.setBody(mfs.getBody());
+		bo.setIsRead("1");//app操作已读
 		res.setData(bo);
 		//更新 message_consumer
 		messageService.updateMessageConsumer(messageId);

+ 2 - 0
src/main/java/com/goafanti/common/constant/PageConstants.java

@@ -25,12 +25,14 @@ public class PageConstants {
 		WEB_DEMAND_PAGES.put("web_index", "网站首页");
 		WEB_DEMAND_PAGES.put("web_demand_main", "网站需求页主页");
 		WEB_DEMAND_PAGES.put("web_demand_list", "网站需求列表页");
+		WEB_DEMAND_PAGES.put("web_demand_trading_index", "需求知识产权交易页面");
 		APP_DEMAND_PAGES.put("app_index", "APP首页");
 		APP_DEMAND_PAGES.put("app_demand_main", "APP需求页主页");
 		APP_DEMAND_PAGES.put("app_demand_list", "APP需求列表页");	
 		WEB_ACHIEVEMENT_PAGES.put("web_index", "网站首页");
 		WEB_ACHIEVEMENT_PAGES.put("web_achievement_main", "网站成果主页");
 		WEB_ACHIEVEMENT_PAGES.put("web_achievement_list", "网站成果列表页");
+		WEB_ACHIEVEMENT_PAGES.put("web_achievement_trading_index", "成果知识产权交易页面");
 		APP_ACHIEVEMENT_PAGES.put("app_index", "网站首页");
 		APP_ACHIEVEMENT_PAGES.put("app_achievement_main", "APP成果主页");
 		APP_ACHIEVEMENT_PAGES.put("app_achievement_list", "APP成果列表页");

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

@@ -471,6 +471,7 @@
   <if test="orderType!=null ">
   and (jtod.commodity_type=#{orderType,jdbcType=INTEGER} or (#{orderType,jdbcType=INTEGER}=10 and (jtod.commodity_type=1 or jtod.commodity_type=0)))
   </if>
+  order by jto.order_time desc
 <if test="page_sql!=null">
 			${page_sql}
 		</if>

+ 2 - 2
src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java

@@ -319,8 +319,8 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 
 	@Override
 	public int updateMessageConsumer(String messageId) {
-//		return messageFromSystemMapper.updateMessageConsumer(messageId, TokenManager.getUserId() , new Date());
-		return messageFromSystemMapper.updateMessageConsumer(messageId, "71a05e9c-a392-480d-817e-678be136cddc" , new Date());
+		return messageFromSystemMapper.updateMessageConsumer(messageId, TokenManager.getUserId() , new Date());
+//		return messageFromSystemMapper.updateMessageConsumer(messageId, "71a05e9c-a392-480d-817e-678be136cddc" , new Date());
 	}
 
 	@SuppressWarnings("unchecked")

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

@@ -23,7 +23,7 @@ public class AdminJtOrderController extends BaseApiController{
 	 * 
 	 * */
 	@RequestMapping(value="/list",method = RequestMethod.GET)
-	public Result getMyJtOrderList(Integer orderType,String orderNo,Date startCreateDate,Date endCreateDate,String sellerName,String buyerName,String commodityName,Integer pageNo,Integer pageSize) {
+	public Result getMyJtOrderList(Integer orderType,String orderNo,String startCreateDate,String endCreateDate,String sellerName,String buyerName,String commodityName,Integer pageNo,Integer pageSize) {
 		Result result=new Result();
 		
 		result.setData(jtOrderService.searchOrderList(orderType,orderNo, startCreateDate, endCreateDate, sellerName, buyerName, commodityName, 2, pageNo, pageSize));  

+ 3 - 2
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 = "/api/user/jtOrder")
+@RequestMapping(value = "/open/api/user/jtOrder")
 public class UserJtOrderController extends BaseApiController {
 	@Resource
 	JtOrderService jtOrderService;
@@ -51,12 +51,13 @@ public class UserJtOrderController extends BaseApiController {
 	 * 
 	 * */
 	@RequestMapping(value="/list",method = RequestMethod.GET)
-	public Result getMyJtOrderList(Integer orderType,String orderNo,Date startCreateDate,Date endCreateDate,String sellerName,String buyerName,String commodityName,Integer userType,Integer pageNo,Integer pageSize) {
+	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;
 	}

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

@@ -10,6 +10,6 @@ import com.goafanti.order.bo.JtOrderResultDetail;
 public interface JtOrderService {
 	int addOrder(List<JtSingleOrder>orderList); 
 	
-	Pagination<JtOrderResultDetail>searchOrderList(Integer orderType,String orderNo,Date startCreateDate,Date endCreateDate,String sellerName,String buyerName,String commodityName,Integer userType,Integer pageNo,Integer pageSize);
+	Pagination<JtOrderResultDetail>searchOrderList(Integer orderType,String orderNo,String startCreateDate,String endCreateDate,String sellerName,String buyerName,String commodityName,Integer userType,Integer pageNo,Integer pageSize);
 
 }

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

@@ -155,7 +155,7 @@ public class JtOrderServiceImpl extends BaseMybatisDao<JtOrderMapper> implements
 	 * */
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<JtOrderResultDetail> searchOrderList(Integer orderType ,String orderNo, Date startCreateDate, Date endCreateDate,
+	public Pagination<JtOrderResultDetail> searchOrderList(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;