修改了代理商订单信息

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/agentInfo/AgentOrder.java

@@ -35,9 +35,18 @@ public class AgentOrder implements java.io.Serializable{
     private String agentTel;            //代理商电话
     private Date beginDate;             //开始时间
     private Date endDate;               //结束时间
+    private String agentOpenId;         //代理商openid
 
     private List<AgentOrderItem> itemList = new ArrayList<AgentOrderItem>();    //订单项集合
 
+    public String getAgentOpenId() {
+        return agentOpenId;
+    }
+
+    public void setAgentOpenId(String agentOpenId) {
+        this.agentOpenId = agentOpenId;
+    }
+
     public Date getBeginDate() {
         return beginDate;
     }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/agentInfo/AgentPurchaseOrderService.java

@@ -67,6 +67,13 @@ public interface AgentPurchaseOrderService {
      * @return
      */
     Integer addOrderHint(OrderHint orderHint);
+
+    /**
+     * 查询代理商订单列表 不分页
+     * @param agentOrder
+     * @return
+     */
+    List<AgentOrder> listSelectAgentOrder(AgentOrder agentOrder);
 }
 
 

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

@@ -137,4 +137,9 @@ public class AgentPurchaseOrderServiceImpl implements AgentPurchaseOrderService
     public Integer addOrderHint(OrderHint orderHint) {
         return agentPurchaseOrderMapper.addOrderHint(orderHint);
     }
+
+    @Override
+    public List<AgentOrder> listSelectAgentOrder(AgentOrder agentOrder) {
+        return agentPurchaseOrderMapper.listSelectAgentOrder(agentOrder);
+    }
 }

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

@@ -73,4 +73,11 @@ public interface AgentPurchaseOrderMapper {
      * @return
      */
     Integer addOrderHint(OrderHint orderHint);
+
+    /**
+     * 查询代理商订单列表 不分页
+     * @param agentOrder
+     * @return
+     */
+    List<AgentOrder> listSelectAgentOrder(AgentOrder agentOrder);
 }

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

@@ -152,6 +152,9 @@
             <if test="colorId !=null and colorId !=''">
                 AND color_id = #{colorId}
             </if>
+            <if test="configStatus != null">
+                AND config_status = #{configStatus}
+            </if>
         </where>
     </select>
 

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

@@ -93,6 +93,37 @@
        agent_orderid = #{agentOrderid}
   </update>
 
+    <!-- 查询代理商订单列表 不分页 -->
+    <select id="listSelectAgentOrder" parameterType="AgentOrder" resultType="AgentOrder">
+      select
+            o.agent_orderid agentOrderid,
+            o.agent_id agentId,
+            o.agent_yet_amount agentYetAmount,
+            o.agent_amount agentAmount,
+            o.agent_create_date agentCreateDate,
+            o.agent_post_num agentPostNum,
+            o.agent_post_firm agentPostFirm,
+            o.agent_status agentStatus,
+            o.agent_send_date agentSendDate,
+            o.agent_address_info agentAddressInfo,
+            o.agent_address_postnum agentAddressPostnum,
+            o.agent_address_tel agentAddressTel,
+            o.agent_address_name agentAddressName,
+            o.agent_admin_remark agentAdminRemark,
+            o.agent_transaction_id agentTransactionId,
+            o.agent_transaction_date agentTransactionDate,
+            a.agent_name agentName,
+            a.agent_tel agentTel,
+            a.agent_openid agentOpenId
+        from
+          tb_iamberry_agent_order o
+        LEFT JOIN tb_iamberry_agent_agentinfo a ON o.agent_id = a.agent_id
+        <where>
+            <if test="agentOrderid != null and agentOrderid != ''">
+                o.agent_orderid = #{agentOrderid}
+            </if>
+        </where>
+    </select>
 
     <!-- 查询代理商订单信息,可分页 -->
     <select id="listAgentOrder" parameterType="AgentOrder" resultMap="agentOrderMap">

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminAgentToothHandler.java

@@ -1,5 +1,6 @@
 package com.iamberry.wechat.handles.admin;
 
+import com.iamberry.app.tool.log.RatFWLogger;
 import com.iamberry.wechat.core.entity.PageBean;
 import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.agentInfo.AgentConfig;
@@ -11,6 +12,8 @@ import com.iamberry.wechat.core.entity.product.ProductColor;
 import com.iamberry.wechat.face.agentInfo.AgentInfoService;
 import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
 import com.iamberry.wechat.face.efast.EfastRentService;
+import com.iamberry.wechat.face.member.MemberService;
+import com.iamberry.wechat.face.order.CodeService;
 import com.iamberry.wechat.face.porduct.ProductColorService;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
@@ -50,6 +53,14 @@ public class AdminAgentToothHandler {
     private AgentPurchaseOrderService agentPurchaseOrderService;
     @Autowired
     private EfastRentService efastRentService;
+    @Autowired
+    private SendMessageUtil sendMessageUtil;
+    @Autowired
+    private RatFWLogger logger;
+    @Autowired
+    private CodeService codeService;
+    @Autowired
+    private MemberService memberService;
 
     /**
      * 分页查询代理商优惠价配置信息
@@ -316,6 +327,14 @@ public class AdminAgentToothHandler {
         return msg;
     }
 
+    /**
+     * 分页查询代理商采购订单信息
+     * @param request
+     * @param pageSize
+     * @param pageNO
+     * @return
+     * @throws Exception
+     */
     @RequestMapping("/select_agent_order_list")
     public ModelAndView selectAgentOrderList(HttpServletRequest request,
                                              @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
@@ -394,9 +413,9 @@ public class AdminAgentToothHandler {
      * @param request
      * @param orderId
      * @throws Exception
-     *//*
+     */
     @ResponseBody
-    @RequestMapping("/sync_efast_order/{orderId}/{type}")
+    @RequestMapping("/sync_efast_order/{orderId}")
     public ResultMsg syncEfastOrder(HttpServletRequest request,
                                       @PathVariable("orderId") String orderId) throws Exception {
         //efast的订单编号
@@ -415,7 +434,6 @@ public class AdminAgentToothHandler {
         //查询efast系统该订单的状态
         Map<String, Object> map = efastRentService.getEfastSendOrderInfo(id,EsastType);
         if (!(boolean) map.get("status")) {
-            msg.setData("");
             msg.setMessage(map.get("result").toString());
             msg.setResultCode(ResultInfo.ERRORCODE);
             msg.setStatus(false);
@@ -423,17 +441,25 @@ public class AdminAgentToothHandler {
         }
 
         //获取订单信息
-        Order or =  adminOrderService.getShopOrderByOrderId(orderId);
+        AgentOrder agentOrder = new AgentOrder();
+        agentOrder.setAgentOrderid(orderId);
+        //查询代理商订单列表
+        List<AgentOrder> orderList =  agentPurchaseOrderService.listSelectAgentOrder(agentOrder);
+        if (orderList == null || orderList.size() == 0) {
+            msg.setMessage("该订单不存在!");
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+            return msg;
+        }
+        agentOrder = orderList.get(0);
 
-        Order order = new Order();
-        order.setSalesOrderid(orderId);
-        order.setSalesStatus(5);
-        order.setSalesPostFirm((String) map.get("postFirm"));
-        order.setSalesPostNum((String) map.get("postNum"));
-        order.setOldStatus(2);
-        order.setSalesOpenid(or.getSalesOpenid());
-        //order.set
-        int flag = adminOrderService.updateOrderDeliver(order);
+        AgentOrder order = new AgentOrder();
+        order.setAgentOrderid(orderId);
+        order.setAgentStatus(5);
+        order.setAgentPostFirm((String) map.get("postFirm"));
+        order.setAgentPostNum((String) map.get("postNum"));
+        //修改代理商订单信息
+        int flag = agentPurchaseOrderService.updateAgentPurchaseOrder(order);
         if (flag < 1){
             msg.setMessage("修改订单状态失败");
             msg.setResultCode(ResultInfo.ERRORCODE);
@@ -441,25 +467,25 @@ public class AdminAgentToothHandler {
             return msg;
         }
 
-        Member member = memberService.getMemberByUserOpenId(or.getSalesOpenid());
+        Member member = memberService.getMemberByUserOpenId(agentOrder.getAgentOpenId());
         if (member == null || 1 == member.getUserStatus() || 0 == member.getUserStatus()){   //未关注或者取消关注的，将发送手机短信
-            logger.info("短信通知："+ or.getSalesOpenid() +" 用户的订单已发货");
-            String phone = or.getSalesAddressTel();
+            logger.info("短信通知："+ agentOrder.getAgentOrderid() +" 用户的订单已发货");
+            String phone = agentOrder.getAgentTel();
             codeService.informShipping(phone,INFORM_SHIPPING);
         }else if(2 == member.getUserStatus()){      //已关注的用户推送信息到公众号
-            logger.info("公众号推送物流信息： "+ or.getSalesOpenid() +" 用户的订单已发货");
+            logger.info("公众号推送物流信息： "+ agentOrder.getAgentOpenId() +" 用户的订单已发货");
             //消息内容
             String data = ResultInfo.ORDERPACKAGETEMP;
             data = data.replaceFirst("firstValueOrder", ResultInfo.SHIPMENTMESSAGE)
                     .replaceFirst("orderIdValueOrder", orderId)
                     .replaceFirst("orderValuePackageId", SendMessageUtil.hashmap.get(map.get("postFirm")) + ":" + map.get("postNum"))
                     .replaceFirst("orderRemarkValue", ResultInfo.INTOSHOP);
-            sendMessageUtil.sendTemplateMessageToOpenid(data, or.getSalesOpenid(), ResultInfo.PAGE_SHIPMENT + orderId, 2);
+            sendMessageUtil.sendTemplateMessageToOpenid(data, agentOrder.getAgentOpenId(), ResultInfo.PAGE_SHIPMENT + orderId, 2);
         }
 
         msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
         msg.setResultCode(ResultInfo.SUCCESSCODE);
         msg.setStatus(true);
         return msg;
-    }*/
+    }
 }

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

@@ -20,6 +20,7 @@ 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.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -268,6 +269,11 @@ public class AgentOrderHandler {
         Map<String,Object> map = new HashMap<String,Object>();
         Member member = WechatUtils.getUserBySession(request);
         AgentTooth agent = new AgentTooth();
+        AgentOrder agentOrder = new AgentOrder();
+        String status = request.getParameter("status");
+        if (StringUtils.isNotEmpty(status)) {
+            agentOrder.setAgentStatus(Integer.parseInt(status));
+        }
         agent.setAgentOpenid(member.getUserOpenid());
         //获取代理商信息
         agent = agentInfoService.getAgentTooth(agent);
@@ -277,7 +283,7 @@ public class AgentOrderHandler {
             msg.setMessage("您不是代理商,没有采购订单!");
             return msg;
         }
-        AgentOrder agentOrder = new AgentOrder();
+
         agentOrder.setAgentId(agent.getAgentId());
         PageBean page = new PageBean();
         page.setPageNumber(pageNO);

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/agentInfo/agentOrderList.jsp

@@ -177,7 +177,7 @@
                 <td class="td-manage">
                     <a onclick="show_address('${order.agentAddressInfo }','${order.agentPostNum }','${order.agentPostFirm }')"
                        title="查看收货地址" href="javascript:;"  class="ml-5" style="text-decoration:none">查看收货地址</a>
-                    <a onclick="getEfastStatus('${pageContext.request.contextPath }/admin/agentTooth/_update_agent_config?configId=${config.configId }')"
+                    <a onclick="getEfastStatus('${order.agentOrderid}')"
                        title="同步物流信息" href="javascript:;"  class="ml-5" style="text-decoration:none">同步物流信息</a>
                 </td>
                 </c:forEach>
@@ -267,7 +267,8 @@
     }
 
     //显示同步订单弹出框
-    function getEfastStatus(){
+    function getEfastStatus(orderId){
+        $('#url').val('${pageContext.request.contextPath }/admin/agentTooth/sync_efast_order/' + orderId);
         $('#layui-SynOrder').show();
     }
 
@@ -275,7 +276,7 @@
      * 同步订单状态
      */
     function submitSynOrder(){
-        var url = '/admin/order/select_efast_order/{orderId}/{type}';
+        var url = $('#url').val();
         var efastOrderId = $("#efastOrderId").val();
         if(efastOrderId == null || efastOrderId == ""){
             $("#msge").html("请输入百胜订单号！");