支付

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/agentInfo/AgentPurchaseOrderServiceImpl.java

@@ -116,5 +116,4 @@ public class AgentPurchaseOrderServiceImpl implements AgentPurchaseOrderService
         return agentPurchaseOrderMapper.updateAgentPurchaseOrder(agentOrder);
     }
 
-
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/agentPurchaseOrderMapper.xml

@@ -168,6 +168,7 @@
         LEFT JOIN tb_iamberry_product_color c ON i.color_id = c.color_id
         WHERE
           agent_orderid = #{agentOrderid}
+        ORDER BY item_id DESC
     </select>
 
 </mapper>

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

@@ -18,7 +18,6 @@ import com.iamberry.wechat.face.pay.PayService;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.OrderNOUtil;
 import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.utils.Result;
 import net.sf.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -56,10 +55,8 @@ public class AgentOrderHandler {
     @RequestMapping("/getProduce")
     public ResultMsg getProduce(HttpServletRequest request) {
         ResultMsg rm = new ResultMsg();
-        //Member member =  WechatUtils.getUserBySession(request);
-        //String agentOpenid = member.getUserOpenid();
-
-        String agentOpenid = "o-icasz5a10CfmJ_s-hvW-Ltqwtc";
+        Member member = WechatUtils.getUserBySession(request);
+        String agentOpenid = member.getUserOpenid();
 
         AgentTooth agentTooth = new AgentTooth();
         agentTooth.setAgentOpenid(agentOpenid);
@@ -107,16 +104,14 @@ public class AgentOrderHandler {
         msg.setStatus(false);
 
         //获取代理商信息
-//        Member member = WechatUtils.getUserBySession(request);
-//        /** 数据格式校验 */
-//        if (member == null || member.getUserOpenid() == null) {// 校验当前用户信息是否丢失
-//            msg.setMessage(ResultInfo.loginOutError);
-//            return msg;
-//        }
-//        String openId = member.getUserOpenid();
-
-        String openId = "o-icasz5a10CfmJ_s-hvW-Ltqwtc";
-        Integer codeId = 101;
+        Member member = WechatUtils.getUserBySession(request);
+        /** 数据格式校验 */
+        if (member == null || member.getUserOpenid() == null) {// 校验当前用户信息是否丢失
+            msg.setMessage(ResultInfo.loginOutError);
+            return msg;
+        }
+        String openId = member.getUserOpenid();
+        Integer codeId = member.getUserId();
 
         AgentTooth agentTooth = new AgentTooth();
         agentTooth.setAgentOpenid(openId);
@@ -149,7 +144,9 @@ public class AgentOrderHandler {
         //---------------生成订单 --- end -----------------------
 
         //支付
-        ResultMsg resultMsg = this.pay((AgentOrder) map.get("agentOrder"), openId);
+        List<AgentOrder> agentOrderList = agentPurchaseOrderService.listAgentOrder(agentOrder);
+        AgentOrder ao = agentOrderList.get(0);
+        ResultMsg resultMsg = this.pay(ao, openId);
 
         if (resultMsg.getResultCode() == ResultInfo.SUCCESSCODE) {
             msg.setResultCode(ResultInfo.SUCCESSCODE);
@@ -178,7 +175,7 @@ public class AgentOrderHandler {
         SendPayDto dto = new SendPayDto();
         dto.setSuccess(false);
         //查询订单项
-        List<AgentOrderItem> agentOrderList = agentPurchaseOrderService.listAgentOrderItemByOrderId(agentOrder.getAgentOrderid());
+        List<AgentOrderItem> agentOrderList = agentOrder.getItemList();
         if (agentOrderList == null || agentOrderList.size() < 1) {
             msg.setResultCode(ResultInfo.ERRORCODE);
             msg.setMessage("查询订单报错");
@@ -254,11 +251,11 @@ public class AgentOrderHandler {
     @ResponseBody
     @RequestMapping("/select_agent_order_list")
     public ResultMsg selectAgentOrderList(HttpServletRequest request,
-                                          @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
+                                          @RequestParam(value = "pageSize", defaultValue = "10", 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);
+        Map<String, Object> map = new HashMap<String, Object>();
+        Member member = WechatUtils.getUserBySession(request);
         AgentTooth agent = new AgentTooth();
         agent.setAgentOpenid(member.getUserOpenid());
         //获取代理商信息
@@ -278,11 +275,51 @@ public class AgentOrderHandler {
         agentOrder.setPage(page);
         //获取订单集合
         List<AgentOrder> agentList = agentPurchaseOrderService.listAgentOrder(agentOrder);
-        map.put("agent",agent);
-        map.put("agentList",agentList);
+        map.put("agent", agent);
+        map.put("agentList", agentList);
         msg.setData(map);
         msg.setResultCode(ResultInfo.SUCCESSCODE);
         msg.setStatus(true);
         return msg;
     }
+
+    /**
+     * 订单列表，支付方法
+     *
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping(value = "/orderToPay")
+    public ResultMsg orderToPay(HttpServletRequest request, String orderId) throws Exception {
+        ResultMsg msg = new ResultMsg();
+
+        //获取代理商信息
+        Member member = WechatUtils.getUserBySession(request);
+        /** 数据格式校验 */
+        if (member == null || member.getUserOpenid() == null) {// 校验当前用户信息是否丢失
+            msg.setMessage(ResultInfo.loginOutError);
+            return msg;
+        }
+        String openId = member.getUserOpenid();
+
+        AgentOrder agentOrder = new AgentOrder();
+        agentOrder.setAgentOrderid(orderId);
+        List<AgentOrder> agentOrderList = agentPurchaseOrderService.listAgentOrder(agentOrder);
+        AgentOrder ao = agentOrderList.get(0);
+        ResultMsg resultMsg = this.pay(ao, openId);
+
+        if (resultMsg.getResultCode() == ResultInfo.SUCCESSCODE) {
+            msg.setResultCode(ResultInfo.SUCCESSCODE);
+            msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+            msg.setStatus(true);
+        } else {
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setMessage(NameUtils.getConfig("ERRORINFO"));
+            msg.setStatus(true);
+        }
+        msg.setData(resultMsg.getData());
+        return msg;
+    }
 }