添加了代理商订单后台处理

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

@@ -29,13 +29,47 @@ public class AgentOrder implements java.io.Serializable{
     private String agentAdminRemark;    //后台的备注
     private String agentTransactionId;  //微信订单号
     private Date agentTransactionDate;  //微信支付时间
-
     private String agentOrderItemJson;  //订单项
-
     private PageBean page;			    //分页
+    private String agentName;           //代理商姓名
+    private String agentTel;            //代理商电话
+    private Date beginDate;             //开始时间
+    private Date endDate;               //结束时间
 
     private List<AgentOrderItem> itemList = new ArrayList<AgentOrderItem>();    //订单项集合
 
+    public Date getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(Date beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getAgentTel() {
+        return agentTel;
+    }
+
+    public void setAgentTel(String agentTel) {
+        this.agentTel = agentTel;
+    }
+
+    public String getAgentName() {
+        return agentName;
+    }
+
+    public void setAgentName(String agentName) {
+        this.agentName = agentName;
+    }
+
     public PageBean getPage() {
         return page;
     }

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

@@ -0,0 +1,75 @@
+package com.iamberry.wechat.core.entity.agentInfo;
+
+import java.util.Date;
+
+/**
+ * 更换电动牙刷刷头实体类
+ * Created by liuzhiwei on 2017/10/16.
+ */
+public class OrderHint implements java.io.Serializable{
+
+    private static final long serialVersionUID = -891517013232064104L;
+    private Integer hintId;         //id
+    private String orderId;         //订单号
+    private String userOpenId;      //openId
+    private Integer hintNum;        //已提示次数
+    private Date hintTime;          //下次提醒时间
+    private Integer hintStatus;     //状态
+    private Date hintCreateTime;    //创建时间
+
+    public Integer getHintId() {
+        return hintId;
+    }
+
+    public void setHintId(Integer hintId) {
+        this.hintId = hintId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getUserOpenId() {
+        return userOpenId;
+    }
+
+    public void setUserOpenId(String userOpenId) {
+        this.userOpenId = userOpenId;
+    }
+
+    public Integer getHintNum() {
+        return hintNum;
+    }
+
+    public void setHintNum(Integer hintNum) {
+        this.hintNum = hintNum;
+    }
+
+    public Date getHintTime() {
+        return hintTime;
+    }
+
+    public void setHintTime(Date hintTime) {
+        this.hintTime = hintTime;
+    }
+
+    public Integer getHintStatus() {
+        return hintStatus;
+    }
+
+    public void setHintStatus(Integer hintStatus) {
+        this.hintStatus = hintStatus;
+    }
+
+    public Date getHintCreateTime() {
+        return hintCreateTime;
+    }
+
+    public void setHintCreateTime(Date hintCreateTime) {
+        this.hintCreateTime = hintCreateTime;
+    }
+}

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

@@ -2,6 +2,7 @@ package com.iamberry.wechat.face.agentInfo;
 
 import com.iamberry.wechat.core.entity.agentInfo.AgentOrder;
 import com.iamberry.wechat.core.entity.agentInfo.AgentOrderItem;
+import com.iamberry.wechat.core.entity.agentInfo.OrderHint;
 
 import java.util.List;
 import java.util.Map;
@@ -39,6 +40,33 @@ public interface AgentPurchaseOrderService {
      */
     List<AgentOrder> listAgentOrder(AgentOrder agentOrder);
 
+    /**
+     * 查询代理商订单信息数量
+     * @param agentOrder
+     * @return
+     */
+    Integer listAgentOrderCount(AgentOrder agentOrder);
+
+    /**
+     * 批量查询需要更换刷头的订单
+     * @param orderHint
+     * @return
+     */
+    List<OrderHint> listOrderHint(OrderHint orderHint);
+
+    /**
+     * 批量修改更换刷头信息
+     * @param list
+     * @return
+     */
+    Integer updateOrderHintList(List<OrderHint> list);
+
+    /**
+     * 添加更换刷头信息
+     * @param orderHint
+     * @return
+     */
+    Integer addOrderHint(OrderHint orderHint);
 }
 
 

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/order/AdminOrderService.java

@@ -89,6 +89,13 @@ public interface AdminOrderService {
 	public Integer updateOrderDeliver(Order order);
 
 	/**
+	 * 添加更换刷头提示信息
+	 * @param order
+	 * @return
+	 */
+	Integer addAgentOrderHint(Order order);
+
+	/**
 	 * 查询状态为待发货的所有订单号
 	 * @return
 	 */

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

@@ -4,6 +4,7 @@ import com.iamberry.wechat.core.entity.OrderUtil;
 import com.iamberry.wechat.core.entity.agentInfo.AgentConfig;
 import com.iamberry.wechat.core.entity.agentInfo.AgentOrder;
 import com.iamberry.wechat.core.entity.agentInfo.AgentOrderItem;
+import com.iamberry.wechat.core.entity.agentInfo.OrderHint;
 import com.iamberry.wechat.core.entity.product.Product;
 import com.iamberry.wechat.core.entity.product.ProductColor;
 import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
@@ -112,9 +113,28 @@ public class AgentPurchaseOrderServiceImpl implements AgentPurchaseOrderService
     }
 
     @Override
+    public Integer listAgentOrderCount(AgentOrder agentOrder) {
+        int count = agentPurchaseOrderMapper.listAgentOrderCount(agentOrder);
+        return	count = count % agentOrder.getPage().getPageSize() == 0? count/agentOrder.getPage().getPageSize():(count/agentOrder.getPage().getPageSize())+1;
+    }
+
+    @Override
     public Integer updateAgentPurchaseOrder(AgentOrder agentOrder) {
         return agentPurchaseOrderMapper.updateAgentPurchaseOrder(agentOrder);
     }
 
+    @Override
+    public List<OrderHint> listOrderHint(OrderHint orderHint) {
+        return agentPurchaseOrderMapper.listOrderHint(orderHint);
+    }
+
+    @Override
+    public Integer updateOrderHintList(List<OrderHint> list) {
+        return agentPurchaseOrderMapper.updateOrderHintList(list);
+    }
 
+    @Override
+    public Integer addOrderHint(OrderHint orderHint) {
+        return agentPurchaseOrderMapper.addOrderHint(orderHint);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.iamberry.wechat.service.mapper;
 
 import com.iamberry.wechat.core.entity.agentInfo.AgentOrder;
 import com.iamberry.wechat.core.entity.agentInfo.AgentOrderItem;
+import com.iamberry.wechat.core.entity.agentInfo.OrderHint;
 
 import java.util.List;
 
@@ -45,4 +46,31 @@ public interface AgentPurchaseOrderMapper {
      */
     List<AgentOrder> listAgentOrder(AgentOrder agentOrder);
 
+    /**
+     * 查询代理商订单信息数量
+     * @param agentOrder
+     * @return
+     */
+    Integer listAgentOrderCount(AgentOrder agentOrder);
+
+    /**
+     * 批量查询需要更换刷头的订单
+     * @param orderHint
+     * @return
+     */
+    List<OrderHint> listOrderHint(OrderHint orderHint);
+
+    /**
+     * 批量修改更换刷头信息
+     * @param list
+     * @return
+     */
+    Integer updateOrderHintList(List<OrderHint> list);
+
+    /**
+     * 添加更换刷头信息
+     * @param orderHint
+     * @return
+     */
+    Integer addOrderHint(OrderHint orderHint);
 }

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

@@ -96,28 +96,52 @@
 
     <!-- 查询代理商订单信息,可分页 -->
     <select id="listAgentOrder" parameterType="AgentOrder" resultMap="agentOrderMap">
-      select
-        agent_orderid,
-        agent_id,
-        agent_yet_amount,
-        agent_amount,
-        agent_create_date,
-        agent_post_num,
-        agent_post_firm,
-        agent_status,
-        agent_send_date,
-        agent_address_info,
-        agent_address_postnum,
-        agent_address_tel,
-        agent_address_name,
-        agent_admin_remark,
-        agent_transaction_id,
-        agent_transaction_date
-      from
-        tb_iamberry_agent_order
+        select
+            o.agent_orderid,
+            o.agent_id,
+            o.agent_yet_amount,
+            o.agent_amount,
+            o.agent_create_date,
+            o.agent_post_num,
+            o.agent_post_firm,
+            o.agent_status,
+            o.agent_send_date,
+            o.agent_address_info,
+            o.agent_address_postnum,
+            o.agent_address_tel,
+            o.agent_address_name,
+            o.agent_admin_remark,
+            o.agent_transaction_id,
+            o.agent_transaction_date,
+            a.agent_name agentName,
+            a.agent_tel agentTel
+        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 != ''">
-              agent_orderid = #{agentOrderid}
+              o.agent_orderid = #{agentOrderid}
+          </if>
+          <if test="agentName != null and agentName != ''">
+              and a.agent_name like CONCAT('%',#{agentName},'%')
+          </if>
+          <if test="agentTel != null and agentTel != ''">
+              and a.agent_tel like CONCAT('%',#{agentTel},'%')
+          </if>
+          <if test="agentAddressName != null and agentAddressName != ''">
+              and o.agent_address_name like CONCAT('%',#{agentAddressName},'%')
+          </if>
+          <if test="agentAddressTel != null and agentAddressTel != ''">
+              and o.agent_address_tel like CONCAT('%',#{agentAddressTel},'%')
+          </if>
+          <if test="agentStatus != null and agentStatus != -1">
+              and o.agent_status = #{agentStatus}
+          </if>
+          <if test="beginDate != null">
+              AND DATE_FORMAT(o.agent_create_date, '%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(#{beginDate},'%Y-%m-%d')
+          </if>
+          <if test="endDate != null">
+              AND DATE_FORMAT(o.agent_create_date, '%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(#{endDate},'%Y-%m-%d')
           </if>
       </where>
         ORDER BY agent_create_date DESC
@@ -170,4 +194,99 @@
           agent_orderid = #{agentOrderid}
     </select>
 
+    <select id="listAgentOrderCount" parameterType="AgentOrder" resultType="Integer">
+        select
+          count(o.agent_orderid)
+        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>
+            <if test="agentName != null and agentName != ''">
+                and a.agent_name like CONCAT('%',#{agentName},'%')
+            </if>
+            <if test="agentTel != null and agentTel != ''">
+                and a.agent_tel like CONCAT('%',#{agentTel},'%')
+            </if>
+            <if test="agentAddressName != null and agentAddressName != ''">
+                and o.agent_address_name like CONCAT('%',#{agentAddressName},'%')
+            </if>
+            <if test="agentAddressTel != null and agentAddressTel != ''">
+                and o.agent_address_tel like CONCAT('%',#{agentAddressTel},'%')
+            </if>
+            <if test="agentStatus != null and agentStatus != -1">
+                and o.agent_status = #{agentStatus}
+            </if>
+            <if test="beginDate != null">
+                AND DATE_FORMAT(o.agent_create_date, '%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(#{beginDate},'%Y-%m-%d')
+            </if>
+            <if test="endDate != null">
+                AND DATE_FORMAT(o.agent_create_date, '%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(#{endDate},'%Y-%m-%d')
+            </if>
+        </where>
+    </select>
+
+    <!-- 批量查询需要更换刷头的订单 -->
+    <select id="listOrderHint" parameterType="OrderHint" resultType="OrderHint">
+      select
+        *
+      from
+        tb_iamberry_order_hint
+      <where>
+          <if test="hintTime != null and hintTime != ''">
+              date_format(hint_time, '%Y-%m-%d') = date_format(#{hintTime}, '%Y-%m-%d')
+          </if>
+          <if test="hintStatus != null and hintStatus != ''">
+              and hint_status = #{hintStatus}
+          </if>
+          <if test="orderId != null and orderId != ''">
+              and order_id = #{orderId}
+          </if>
+          <if test="userOpenId != null and userOpenId != ''">
+              and user_open_id = #{userOpenId}
+          </if>
+          <if test="hintId != null and hintId != ''">
+              and hint_id = #{hintId}
+          </if>
+      </where>
+    </select>
+
+    <!-- 批量修改更换刷头信息 -->
+    <update id="updateOrderHintList" parameterType="java.util.List">
+        <foreach collection="list" item="item" index="index" separator=";" open="" close="">
+          update
+            tb_iamberry_order_hint
+          <set>
+              <if test="item.hintTime != null and item.hintTime != ''">
+                  hint_time = #{item.hintTime},
+              </if>
+              <if test="item.hintStatus != null and item.hintStatus != ''">
+                  hint_status = #{item.hintStatus}
+              </if>
+              <if test="item.hintNum != null and item.hintNum != ''">
+                  hint_num = (hint_num + 1)
+              </if>
+          </set>
+          <where>
+              hint_id = #{item.hintId}
+          </where>
+        </foreach>
+    </update>
+
+    <!-- 添加更换刷头信息 -->
+    <insert id="addOrderHint" parameterType="OrderHint"
+            useGeneratedKeys="true" keyProperty="hintId">
+      insert into tb_iamberry_order_hint
+      (
+        order_id,user_open_id,hint_num,hint_time,
+        hint_status,hint_create_time
+      )
+      values
+      (
+        #{orderId},#{userOpenId},#{hintNum},#{hintTime},
+        #{hintStatus},NOW()
+      )
+    </insert>
 </mapper>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/order/AdminOrderServiceImpl.java

@@ -1,11 +1,10 @@
 package com.iamberry.wechat.service.order;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
+import com.iamberry.wechat.core.entity.agentInfo.OrderHint;
 import com.iamberry.wechat.core.entity.statictics.StatisticsSalesOrder;
+import com.iamberry.wechat.service.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,10 +25,6 @@ import com.iamberry.wechat.core.entity.relationship.WdRelation;
 import com.iamberry.wechat.core.entity.rewards.RewardsLog;
 import com.iamberry.wechat.core.entity.rewards.SalesLog;
 import com.iamberry.wechat.face.order.AdminOrderService;
-import com.iamberry.wechat.service.mapper.RebackInfoMapper;
-import com.iamberry.wechat.service.mapper.RewardsMapper;
-import com.iamberry.wechat.service.mapper.SalesLogMapper;
-import com.iamberry.wechat.service.mapper.TemplateFlowInfoMapper;
 import com.iamberry.wechat.service.member.dao.CashLogDao;
 import com.iamberry.wechat.service.order.dao.AdminOrderDao;
 import com.iamberry.wechat.service.relationship.Dao.DealerRelationDao;
@@ -69,6 +64,10 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	
 	@Autowired
 	private RewardsMapper rewardsMapper;
+	@Autowired
+	private AgentPurchaseOrderMapper agentPurchaseOrderMapper;
+	@Autowired
+	private AdminOrderService adminOrderService;
 	
 	/**
 	 * 根据订单编号，获取该订单的返利信息
@@ -135,18 +134,60 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	
 	public boolean deliverOrderByOrderId(Order order) {
 		// TODO Auto-generated method stub
-		return this.adminOrderDao.deliverOrderByOrderId(order) >= 1 ? true : false;
+		//修改订单状态为已发货状态
+		int num = this.adminOrderDao.deliverOrderByOrderId(order);
+		//添加更换刷头提示信息
+		int count = adminOrderService.addAgentOrderHint(order);
+		if (num > 0 && count > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	
 	public Integer updateOrderDeliver(Order order) {
 		// TODO Auto-generated method stub
-		return adminOrderDao.updateOrderDeliver(order);
+		int num = adminOrderDao.updateOrderDeliver(order);
+		//添加更换刷头提示信息
+		int count = adminOrderService.addAgentOrderHint(order);
+		if (num > 0 && count > 0) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+
+	@Override
+	public Integer addAgentOrderHint(Order order) {
+		//获取更换刷头时间间隔
+		ShopSystemRule rule =  adminOrderDao.getReluByRid(245);
+		boolean flag = false;	//判断是否需要添加更换刷头提示
+		int count = 1;
+		OrderHint orderHint = new OrderHint();
+		orderHint.setOrderId(order.getSalesOrderid());
+		orderHint.setUserOpenId(order.getSalesOpenid());
+		orderHint.setHintStatus(1);
+		//查询更换刷头列表
+		List<OrderHint> hintList = agentPurchaseOrderMapper.listOrderHint(orderHint);
+		if (hintList == null || hintList.size() == 0) {
+			flag = true;
+		}
+		if (flag) {
+			Calendar cl = Calendar.getInstance();
+			cl.setTime(new Date());
+			//提示时间添加3个月
+			cl.add(Calendar.MONTH, +rule.getRuleNum().intValue());
+			orderHint.setHintTime(cl.getTime());
+			orderHint.setHintNum(0);
+			//添加更换刷头提示
+			count = agentPurchaseOrderMapper.addOrderHint(orderHint);
+		}
+		return count;
 	}
 
-	
 	public boolean updateOrderAdminRemarkByOrderId(String remark,
-			String orderId, Integer remarkColor) {
+												   String orderId, Integer remarkColor) {
 		// TODO Auto-generated method stub
 		Order order = new Order();
 		order.setSalesAdminRemark(remark);

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

@@ -3,25 +3,37 @@ package com.iamberry.wechat.handles.admin;
 import com.iamberry.wechat.core.entity.PageBean;
 import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.agentInfo.AgentConfig;
+import com.iamberry.wechat.core.entity.agentInfo.AgentOrder;
 import com.iamberry.wechat.core.entity.agentInfo.AgentTooth;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.order.Order;
 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.porduct.ProductColorService;
+import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
+import com.iamberry.wechat.utils.SendMessageUtil;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.iamberry.wechat.service.ImberryConfig.INFORM_SHIPPING;
+
 /**
  * 代理商逻辑处理类
  * Created by liuzhiwei on 2017/10/11.
@@ -34,6 +46,10 @@ public class AdminAgentToothHandler {
     private AgentInfoService agentInfoService;
     @Autowired
     private ProductColorService productColorService;
+    @Autowired
+    private AgentPurchaseOrderService agentPurchaseOrderService;
+    @Autowired
+    private EfastRentService efastRentService;
 
     /**
      * 分页查询代理商优惠价配置信息
@@ -299,4 +315,151 @@ public class AdminAgentToothHandler {
         }
         return msg;
     }
+
+    @RequestMapping("/select_agent_order_list")
+    public ModelAndView selectAgentOrderList(HttpServletRequest request,
+                                             @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
+                                             @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO) throws Exception {
+        ModelAndView mv = new ModelAndView("admin/agentInfo/agentOrderList");
+        AgentOrder agentOrder = new AgentOrder();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        StringBuilder url = new StringBuilder("/admin/agentTooth/select_agent_order_list?pageSize=");
+        url.append(pageSize);
+        String agentStatus = request.getParameter("agentStatus");
+        String agentName = request.getParameter("agentName");
+        String agentTel = request.getParameter("agentTel");
+        String agentAddressName = request.getParameter("agentAddressName");
+        String agentAddressTel = request.getParameter("agentAddressTel");
+        String beginDate = request.getParameter("beginDate");
+        String endDate = request.getParameter("endDate");
+        if (StringUtils.isNotEmpty(agentStatus)) {
+            agentOrder.setAgentStatus(Integer.parseInt(agentStatus));
+            url.append("&agentStatus=");
+            url.append(Integer.parseInt(agentStatus));
+            mv.addObject("agentStatus",Integer.parseInt(agentStatus));
+        }
+        if (StringUtils.isNotEmpty(agentName)) {
+            agentOrder.setAgentName(agentName);
+            url.append("&agentName=");
+            url.append(agentName);
+            mv.addObject("agentName",agentName);
+        }
+        if (StringUtils.isNotEmpty(agentTel)) {
+            agentOrder.setAgentTel(agentTel);
+            url.append("&agentTel=");
+            url.append(agentTel);
+            mv.addObject("agentTel",agentTel);
+        }
+        if (StringUtils.isNotEmpty(agentAddressName)) {
+            agentOrder.setAgentAddressName(agentAddressName);
+            url.append("&agentAddressName=");
+            url.append(agentAddressName);
+            mv.addObject("agentAddressName",agentAddressName);
+        }
+        if (StringUtils.isNotEmpty(agentAddressTel)) {
+            agentOrder.setAgentAddressTel(agentAddressTel);
+            url.append("&agentAddressTel=");
+            url.append(agentAddressTel);
+            mv.addObject("agentAddressTel",agentAddressTel);
+        }
+        if (StringUtils.isNotEmpty(beginDate)) {
+            url.append("&beginDate=");
+            url.append(beginDate);
+            mv.addObject("beginDate",beginDate);
+            agentOrder.setBeginDate(format.parse(beginDate));
+        }
+        if (StringUtils.isNotEmpty(endDate)) {
+            url.append("&endDate=");
+            url.append(endDate);
+            mv.addObject("endDate",endDate);
+            agentOrder.setEndDate(format.parse(endDate));
+        }
+
+        PageBean page = new PageBean();
+        page.setPageNumber(pageNO);
+        page.setPageSize(pageSize);
+        page.initRecordBegin();
+        agentOrder.setPage(page);
+        List agentOrderList = agentPurchaseOrderService.listAgentOrder(agentOrder);
+        url.append("&pageNO=");
+        mv.addObject("agentOrderList",agentOrderList);
+        mv.addObject("pageNO", pageNO);
+        mv.addObject("pageSize", agentPurchaseOrderService.listAgentOrderCount(agentOrder));
+        mv.addObject("url",url.toString());
+        return mv;
+    }
+
+    /**
+     * 同步订单状态
+     * @param request
+     * @param orderId
+     * @throws Exception
+     *//*
+    @ResponseBody
+    @RequestMapping("/sync_efast_order/{orderId}/{type}")
+    public ResultMsg syncEfastOrder(HttpServletRequest request,
+                                      @PathVariable("orderId") String orderId) throws Exception {
+        //efast的订单编号
+        String efastOrderId = request.getParameter("efastOrderId");
+        ResultMsg msg = new ResultMsg();
+
+        if (!StringUtils.isNotEmpty(orderId)) {
+            msg.setMessage("订单号为空!");
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+            return msg;
+        }
+
+        String id = efastOrderId;
+        String EsastType = "1"; //0：百胜外部交易号；  1：百胜订单号
+        //查询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);
+            return msg;
+        }
+
+        //获取订单信息
+        Order or =  adminOrderService.getShopOrderByOrderId(orderId);
+
+        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);
+        if (flag < 1){
+            msg.setMessage("修改订单状态失败");
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+            return msg;
+        }
+
+        Member member = memberService.getMemberByUserOpenId(or.getSalesOpenid());
+        if (member == null || 1 == member.getUserStatus() || 0 == member.getUserStatus()){   //未关注或者取消关注的，将发送手机短信
+            logger.info("短信通知："+ or.getSalesOpenid() +" 用户的订单已发货");
+            String phone = or.getSalesAddressTel();
+            codeService.informShipping(phone,INFORM_SHIPPING);
+        }else if(2 == member.getUserStatus()){      //已关注的用户推送信息到公众号
+            logger.info("公众号推送物流信息： "+ or.getSalesOpenid() +" 用户的订单已发货");
+            //消息内容
+            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);
+        }
+
+        msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setStatus(true);
+        return msg;
+    }*/
 }

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

@@ -231,7 +231,7 @@ public class AdminOrderHandlers {
      * 同步订单状态
      * @param request
      * @param orderId
-     * @param type    1:销售订单
+     * @param type    1:销售订单,2:代理商采购订单
      * @throws Exception
      */
     @ResponseBody
@@ -265,24 +265,25 @@ public class AdminOrderHandlers {
             return msg;
         }
 
+        //获取订单信息
+        Order or =  adminOrderService.getShopOrderByOrderId(orderId);
+
         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);
         if (flag < 1){
-            msg.setData("");
             msg.setMessage("修改订单状态失败");
             msg.setResultCode(ResultInfo.ERRORCODE);
             msg.setStatus(false);
             return msg;
         }
 
-        Order or = new Order();
-        or =  adminOrderService.getShopOrderByOrderId(orderId);
         Member member = memberService.getMemberByUserOpenId(or.getSalesOpenid());
         if (member == null || 1 == member.getUserStatus() || 0 == member.getUserStatus()){   //未关注或者取消关注的，将发送手机短信
             logger.info("短信通知："+ or.getSalesOpenid() +" 用户的订单已发货");
@@ -299,7 +300,6 @@ public class AdminOrderHandlers {
             sendMessageUtil.sendTemplateMessageToOpenid(data, or.getSalesOpenid(), ResultInfo.PAGE_SHIPMENT + orderId, 2);
         }
 
-        msg.setData("");
         msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
         msg.setResultCode(ResultInfo.SUCCESSCODE);
         msg.setStatus(true);
@@ -519,6 +519,7 @@ public class AdminOrderHandlers {
         Order currentOrder = adminOrderService.selectOrderStatusByOrderId(orderId);
         Integer orderStatus = currentOrder.getSalesStatus();
         order.setOldStatus(orderStatus);
+        order.setSalesOpenid(currentOrder.getSalesOpenid());
         if (!orderUtil.orderStatusIntToOrderStatusString(orderStatus).equals(actionDto.getOrderStatus())) {
             mv.addObject("msgObj", new MessageDto(false, "对不起，操作有误", "对不起，您刚才的操作流程有误，请按照系统流程操作！"));
             return mv;

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

@@ -3,8 +3,10 @@ package com.iamberry.wechat.handles.agentInfo;
 import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.core.entity.agentInfo.AgentTooth;
+import com.iamberry.wechat.core.entity.agentInfo.OrderHint;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.face.agentInfo.AgentInfoService;
+import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.face.order.CodeService;
 import com.iamberry.wechat.tools.ResponseJson;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * 代理商逻辑处理类
@@ -31,6 +34,8 @@ public class AgentToothHandler {
     private CodeService codeService;
     @Autowired
     private MemberService memberService;
+    @Autowired
+    private AgentPurchaseOrderService agentPurchaseOrderService;
 
     /**
      * 查询代理商信息
@@ -114,4 +119,28 @@ public class AgentToothHandler {
             return msg;
         }
     }
+
+    public ResultMsg selectOrderHint(HttpServletRequest request) throws Exception {
+        ResultMsg msg = new ResultMsg();
+        String hintId = request.getParameter("hintId");
+        if (!StringUtils.isNotEmpty(hintId)) {
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+            return msg;
+        }
+        OrderHint hint = new OrderHint();
+        hint.setHintId(Integer.parseInt(hintId));
+        //查询更换刷头列表
+        List<OrderHint> hintList = agentPurchaseOrderService.listOrderHint(hint);
+        if (hintList == null || hintList.size() <= 0) {
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+            return msg;
+        }
+        hint = hintList.get(0);
+        msg.setData(hint);
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setStatus(true);
+        return msg;
+    }
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -2,15 +2,14 @@ package com.iamberry.wechat.handles.mq;
 
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
+import com.iamberry.wechat.core.entity.agentInfo.OrderHint;
 import com.iamberry.wechat.face.admin.SystemService;
+import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.NameUtils;
 import org.apache.commons.lang.StringUtils;
@@ -68,6 +67,8 @@ public class MQTask implements InitializingBean {
 	private CodeService codeService;
 	@Autowired
 	private SystemService systemService;
+	@Autowired
+	private AgentPurchaseOrderService agentPurchaseOrderService;
 	
 	private Lock lock = new ReentrantLock();
 
@@ -375,4 +376,33 @@ public class MQTask implements InitializingBean {
 		}
 
 	}
+
+	@SuppressWarnings(value = {"unchecked", "rawtypes"})
+	@Scheduled(cron = "0 0/1 * * * ?")
+	public void updateToothHint() {
+		//获取更换刷头时间间隔
+		ShopSystemRule rule =  systemService.selectOneShopRuleById(245);
+		List<OrderHint> list = new ArrayList<OrderHint>();
+		OrderHint orderHint = new OrderHint();
+		orderHint.setHintTime(new Date());
+		orderHint.setHintStatus(1);
+		//根据时间和状态获取需要提示的
+		List<OrderHint> orderList = agentPurchaseOrderService.listOrderHint(orderHint);
+		if (orderList == null || orderList.size() == 0) {
+			return;
+		}
+		for (int i = 0;i < orderList.size();i++) {
+			OrderHint order = orderList.get(i);
+			Calendar cl = Calendar.getInstance();
+			cl.setTime(order.getHintTime());
+			cl.add(Calendar.MONTH, +rule.getRuleNum().intValue());
+			OrderHint hint = new OrderHint();
+			hint.setHintTime(cl.getTime());
+			hint.setHintId(order.getHintId());
+			hint.setHintNum(1);
+			list.add(hint);
+		}
+		//批量修改更换刷头信息
+		int num = agentPurchaseOrderService.updateOrderHintList(list);
+	}
 }

tooth-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -225,6 +225,7 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.agentInfo.AgentTooth" alias="AgentTooth"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.agentInfo.AgentOrder" alias="AgentOrder"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.agentInfo.AgentOrderItem" alias="AgentOrderItem"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.agentInfo.OrderHint" alias="OrderHint"/>
 
 		<!-- 销售统计 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.statictics.StatisticsSalesOrder" alias="StatisticsSalesOrder"/>

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

@@ -0,0 +1,305 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <LINK rel="Bookmark" href="/favicon.ico">
+    <LINK rel="Shortcut Icon" href="/favicon.ico" />
+    <!--[if lt IE 9]>
+    <script type="text/javascript" src="lib/html5.js"></script>
+    <script type="text/javascript" src="lib/respond.min.js"></script>
+    <script type="text/javascript" src="lib/PIE_IE678.js"></script>
+    <![endif]-->
+    <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+    <link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+    <link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+
+    <!--[if IE 6]>
+    <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
+    <script>DD_belatedPNG.fix('*');</script>
+    <![endif]-->
+    <title>产品列表</title>
+</head>
+<body>
+<!-- 后台备注 -->
+<div class="layui-layer layui-anim layui-layer-iframe" id="layui-address" times="4" showtime="0" contype="string" style="display:none;z-index: 19891018; width: 400px; height: 260px; position: absolute; top: 100px; left: 379px;">
+    <form action="" method="post" class="form form-horizontal" id="form-admin-remark">
+        <div class="layui-layer-title" id="sendOrderNote" style="cursor: move;" move="ok">订单备注</div>
+        <div class="row cl">
+            <label class="form-label col-3"><span class="c-red">*</span>&nbsp;&nbsp;物流公司：</label>
+            <div class="formControls col-5">
+                <span id="postFirm" name="postFirm"></span>
+            </div>
+            <div class="col-4"> </div>
+        </div>
+        <div class="row cl">
+            <label class="form-label col-3"><span class="c-red">*</span>&nbsp;&nbsp;物流单号：</label>
+            <div class="formControls col-5">
+                <span id="postNum" name="postNum"></span>
+            </div>
+            <div class="col-4"> </div>
+        </div>
+        <div class="row cl">
+            <label class="form-label col-3"><span class="c-red">*</span>&nbsp;&nbsp;收货地址：</label>
+            <div class="formControls col-5">
+                <span id="addressInfo" name="addressInfo"></span>
+            </div>
+            <div class="col-4"> </div>
+        </div>
+        <br/>
+        <div class="col-9 col-offset-3">
+            <input class="btn btn-primary radius" type="button" onclick="close_address()" value="&nbsp;&nbsp;关闭&nbsp;&nbsp;">
+        </div>
+    </form>
+    <span class="layui-layer-setwin">
+			<a class="layui-layer-ico layui-layer-close layui-layer-close1" onclick="exitWindowsDiv(this)" href="javascript:;"></a>
+		</span>
+</div>
+<!-- 同步订单状态 -->
+<div class="layui-layer layui-anim layui-layer-iframe" id="layui-SynOrder" times="4" showtime="0" contype="string" style="display:none;z-index: 19891018; width: 400px; height: 260px; position: absolute; top: 100px; left: 379px;">
+    <form action="" method="post" class="form form-horizontal" id="form-admin-SynOrder">
+        <div class="layui-layer-title" id="synOrder" style="cursor: move;" move="ok">同步订单状态</div>
+        <br>
+        <div class="row cl">
+            <label class="form-label col-3"><span class="c-red">*</span>&nbsp;订单编号：</label>
+            <div class="formControls col-5">
+                <input type="hidden" id="url">
+                <input type="text" id="efastOrderId" class="input-text" value="" placeholder="请输入百胜订单号" name="postNum" datatype="*2-20" nullmsg="订单编号不能为空">
+            </div>
+            <div class="col-4"> </div>
+        </div>
+        <div class="row cl">
+            <div class="formControls col-8">&nbsp;&nbsp;&nbsp;<span class="c-red" id="msge"></span></div>
+        </div>
+        <br>
+        <div class="col-9 col-offset-3">
+            <input class="btn btn-primary radius" onclick="return submitSynOrder()" type="button" value="&nbsp;&nbsp;同步&nbsp;&nbsp;">
+        </div>
+    </form>
+    <span class="layui-layer-setwin">
+				<a class="layui-layer-ico layui-layer-close layui-layer-close1" onclick="exitWindowsDiv(this)" href="javascript:;"></a>
+		</span>
+</div>
+<nav class="breadcrumb">
+    <i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span>
+    商城管理 <span class="c-gray en">&gt;</span>代理商采购订单管理 <a
+        class="btn btn-success radius r mr-20"
+        style="line-height: 1.6em; margin-top: 3px"
+        href="javascript:location.replace(location.href);" title="刷新"><i
+        class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="pd-20">
+    <div class="cl pd-5 bg-1 bk-gray mt-20">
+        <form action="${pageContext.request.contextPath }/admin/agentTooth/select_agent_order_list" method="post" id="searchForm">
+            <div class="text-c">
+                <select name="agentStatus" style="height: 30px;">
+                    <option value="">订单状态</option>
+                    <option <c:if test="${agentStatus == 0}">selected = "selected"</c:if> value="0">取消订单</option>
+                    <option <c:if test="${agentStatus == 1}">selected = "selected"</c:if> value="1">待支付</option>
+                    <option <c:if test="${agentStatus == 2}">selected = "selected"</c:if> value="2">已支付、待发货</option>
+                    <option <c:if test="${agentStatus == 5}">selected = "selected"</c:if> value="5">已发货</option>
+                </select>
+                <input type="text" class="input-text" style="width:130px" placeholder="请输入代理商姓名" value="${agentName}" name="agentName">
+                <input type="text" class="input-text" style="width:130px" placeholder="请输入代理商电话" value="${agentTel}" name="agentTel">
+                <input type="text" class="input-text" style="width:130px" placeholder="请输入收货人名称" value="${agentAddressName}" name="agentAddressName">
+                <input type="text" class="input-text" style="width:130px" placeholder="请输入收货人电话" value="${agentAddressTel}" name="agentAddressTel">
+                <input type="text" placeholder="开始日期" readonly="readonly" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01\'}'})" id="beginDate" value="${beginDate }" name="beginDate" class="input-text Wdate" style="width: 120px;">
+                - <input type="text" placeholder="结束日期" readonly="readonly" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01'})" id="endDate" value="${endDate }" name="endDate" class="input-text Wdate" style="width: 120px;">
+                <button type="submit" class="btn btn-success radius" id="searchButton" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
+            </div>
+        </form>
+    </div>
+    <form id="configform" >
+        <table class="table table-border table-bordered table-bg" id="example">
+            <thead>
+            <tr>
+                <th scope="col" colspan="11">代理商采购订单列表</th>
+            </tr>
+            <tr class="text-c">
+                <th width="100">订单状态</th>
+                <th width="100">代理商姓名</th>
+                <th width="100">代理商电话</th>
+                <th width="100">收货人姓名</th>
+                <th width="100">收货人电话</th>
+                <th width="90">订单金额(元)</th>
+                <th width="90">支付金额(元)</th>
+                <th width="130">采购数量</th>
+                <th width="130">采购日期</th>
+                <th width="130">订单备注</th>
+                <th width="100">操作</th>
+            </tr>
+            </thead>
+            <tbody>
+            <c:if test="${! (empty agentOrderList) }">
+            <c:forEach items="${agentOrderList }" var="order">
+            <tr class="text-c">
+                <input type="hidden" value="${order.agentOrderid }" id="agentOrderid" name="agentOrderid">
+                <td>
+                    <c:if test="${order.agentStatus == 0}">
+                        取消订单
+                    </c:if>
+                    <c:if test="${order.agentStatus == 1}">
+                        待支付
+                    </c:if>
+                    <c:if test="${order.agentStatus == 2}">
+                        已支付、待发货
+                    </c:if>
+                    <c:if test="${order.agentStatus == 5}">
+                        已发货
+                    </c:if>
+                </td>
+                <td>${order.agentName }</td>
+                <td>${fn:substring(order.agentTel,0,3)}****${fn:substring(order.agentTel,7,11)}</td>
+                <td>${order.agentAddressName }</td>
+                <td>${fn:substring(order.agentAddressTel,0,3)}****${fn:substring(order.agentAddressTel,7,11)}</td>
+                <td>${order.agentAmount==null?"":order.agentAmount/100 }</td>
+                <td>${order.agentYetAmount==null?"":order.agentYetAmount/100 }</td>
+                <td>
+                    <c:if test="${! (empty order.itemList) }">
+                        <c:forEach items="${order.itemList }" var="item">
+                            ${item.itemProductName}(${item.itemColorName})*${item.itemNum},
+                        </c:forEach>
+                    </c:if>
+                </td>
+                <td><fmt:formatDate value="${order.agentCreateDate }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+                <td>${order.agentAdminRemark }</td>
+                <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 }')"
+                       title="同步物流信息" href="javascript:;"  class="ml-5" style="text-decoration:none">同步物流信息</a>
+                </td>
+                </c:forEach>
+                </c:if>
+            </tbody>
+        </table>
+        <div align="right" class="mt-10 mb-10 mr-10">
+            <%@include file="/common/other/paper/pager.jsp"%>
+        </div>
+    </form>
+</div>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/js/page/jqPaginator.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/goods/js/utils.js"></script>
+<script type="text/javascript">
+    function updateGiftState(_this,id){
+        var obj = $(_this);
+        layer.confirm('确认要修改状态吗？',function(index){
+                $.ajax({
+                    url: '${pageContext.request.contextPath }/admin/agentTooth/update_agent_config_status',
+                    type: "POST",
+                    dataType: "json",
+                    data: {configId : id,configStatus : obj.val()},
+                    error:function(data){
+                        layer.msg("修改失败</br>",{icon: 5,time:2000});
+                    },
+                    success:  function(data){
+                        if (data.status) {
+                            layer.msg("修改成功</br>",{icon: 1,time:2000});
+                            var message = '';
+                            switch (obj.val()) {
+                                case "1":
+                                    message = '启用';
+                                    break;
+                                case "2":
+                                    message = '停用';
+                                    break;
+                            }
+                            $('#config_status').html(message);
+                        } else {
+                            layer.msg("修改失败</br>",{icon: 5,time:2000});
+                        }
+                    }
+                });
+            }, function () {
+                window.location.reload(location.href);
+            }
+        );
+
+    }
+    /**
+     * 打开修改商品界面
+     */
+    function config_edit(url){
+        window.location.href = url;
+    }
+
+    //显示物流信息
+    function show_address(addressInfo,postNum,postFirm) {
+        if (addressInfo == null || addressInfo == '') {
+            $('#addressInfo').html('暂无');
+        } else {
+            $('#addressInfo').html(addressInfo);
+        }
+        if (postNum == null || postNum == '') {
+            $('#postNum').html('暂无');
+        } else {
+            $('#postNum').html(postNum);
+        }
+        if (postNum == null || postNum == '') {
+            $('#postFirm').html('暂无');
+        } else {
+            $('#postFirm').html(postFirm);
+        }
+        $('#layui-address').show();
+    }
+
+    //隐藏物流信息
+    function close_address() {
+        $('#layui-address').hide();
+    }
+
+    //显示同步订单弹出框
+    function getEfastStatus(){
+        $('#layui-SynOrder').show();
+    }
+
+    /**
+     * 同步订单状态
+     */
+    function submitSynOrder(){
+        var url = '/admin/order/select_efast_order/{orderId}/{type}';
+        var efastOrderId = $("#efastOrderId").val();
+        if(efastOrderId == null || efastOrderId == ""){
+            $("#msge").html("请输入百胜订单号！");
+            return false;
+        }
+        $.ajax({
+            type:'POST',
+            url: url,
+            data:{
+                efastOrderId : efastOrderId
+            },
+            dataType: 'json',
+            success:function(res) {
+                debugger;
+                if(res.resultCode == 200){
+                    $("#msge").html("同步成功");
+                    location.reload();
+                }else{
+                    $("#msge").html(res.message);
+                }
+                return false;
+            }
+        });
+    }
+</script>
+</body>
+</html>