|
|
@@ -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()) {
|