Преглед на файлове

修改了前台查询订单的接口和推送百胜的接口

liuzhiwei преди 7 години
родител
ревизия
bcbfb5e56e

+ 8 - 0
tooth-common-core/pom.xml

@@ -53,4 +53,12 @@
 			</properties>
 		</profile>
 	</profiles>
+	<!-- 爱贝源仓库 -->
+	<repositories>
+		<repository>
+			<id>Iamberr_Nexus</id>
+			<name>iamberry nexus</name>
+			<url>http://maven.iamberry.com/content/groups/public/</url>
+		</repository>
+	</repositories>
 </project>

+ 8 - 0
tooth-common-tool/pom.xml

@@ -54,4 +54,12 @@
 			</properties>
 		</profile>
 	</profiles>
+	<!-- 爱贝源仓库 -->
+	<repositories>
+		<repository>
+			<id>Iamberr_Nexus</id>
+			<name>iamberry nexus</name>
+			<url>http://maven.iamberry.com/content/groups/public/</url>
+		</repository>
+	</repositories>
 </project>

+ 8 - 0
tooth-common-web/pom.xml

@@ -42,4 +42,12 @@
 			</plugin>
 		</plugins>
 	</build>
+	<!-- 爱贝源仓库 -->
+	<repositories>
+		<repository>
+			<id>Iamberr_Nexus</id>
+			<name>iamberry nexus</name>
+			<url>http://maven.iamberry.com/content/groups/public/</url>
+		</repository>
+	</repositories>
 </project>

+ 8 - 0
tooth-wechat-interface/pom.xml

@@ -53,4 +53,12 @@
             </properties>
         </profile>
     </profiles>
+    <!-- 爱贝源仓库 -->
+    <repositories>
+        <repository>
+            <id>Iamberr_Nexus</id>
+            <name>iamberry nexus</name>
+            <url>http://maven.iamberry.com/content/groups/public/</url>
+        </repository>
+    </repositories>
 </project>

+ 8 - 0
tooth-wechat-service/pom.xml

@@ -65,4 +65,12 @@
 			</properties>
 		</profile>
 	</profiles>
+	<!-- 爱贝源仓库 -->
+	<repositories>
+		<repository>
+			<id>Iamberr_Nexus</id>
+			<name>iamberry nexus</name>
+			<url>http://maven.iamberry.com/content/groups/public/</url>
+		</repository>
+	</repositories>
 </project>

+ 8 - 0
tooth-wechat-web/pom.xml

@@ -87,4 +87,12 @@
             </properties>
         </profile>
     </profiles>
+    <!-- 爱贝源仓库 -->
+    <repositories>
+        <repository>
+            <id>Iamberr_Nexus</id>
+            <name>iamberry nexus</name>
+            <url>http://maven.iamberry.com/content/groups/public/</url>
+        </repository>
+    </repositories>
 </project>

+ 1 - 1
tooth-wechat-web/src/main/java/com/iamberry/wechat/filters/WechatFilter.java

@@ -24,7 +24,7 @@ import com.iamberry.wechat.core.entity.WechatUtils;
  * @date	2016年12月2日
  * @explain
  */
-//@WebFilter(value = { "/wechat/*","/pay/goOrderInfo" })
+@WebFilter(value = { "/wechat/*","/pay/goOrderInfo" })
 public class WechatFilter implements Filter {
 
 	private static Logger logger = LoggerFactory.getLogger(WechatFilter.class);

+ 12 - 4
tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/agentInfo/AgentOrderHandler.java

@@ -251,14 +251,22 @@ public class AgentOrderHandler {
         return true;
     }
 
+    /**
+     * 分页查询代理商采购订单
+     * @param request
+     * @param pageSize
+     * @param pageNO
+     * @return
+     * @throws Exception
+     */
     @ResponseBody
     @RequestMapping("/select_agent_order_list")
     public ResultMsg selectAgentOrderList(HttpServletRequest request,
-                                          @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
+                                          @RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize,
                                           @RequestParam(value = "pageNO", defaultValue = "1") Integer pageNO) throws Exception {
         ResultMsg msg = new ResultMsg();
         Map<String,Object> map = new HashMap<String,Object>();
-        Member member =  WechatUtils.getUserBySession(request);
+        Member member = WechatUtils.getUserBySession(request);
         AgentTooth agent = new AgentTooth();
         agent.setAgentOpenid(member.getUserOpenid());
         //获取代理商信息
@@ -277,9 +285,9 @@ public class AgentOrderHandler {
         page.initRecordBegin();
         agentOrder.setPage(page);
         //获取订单集合
-        List<AgentOrder> agentList = agentPurchaseOrderService.listAgentOrder(agentOrder);
+        List<AgentOrder> agentOrderList = agentPurchaseOrderService.listAgentOrder(agentOrder);
         map.put("agent",agent);
-        map.put("agentList",agentList);
+        map.put("agentOrderList",agentOrderList);
         msg.setData(map);
         msg.setResultCode(ResultInfo.SUCCESSCODE);
         msg.setStatus(true);