优惠券修改

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/receive/ChargReceiveService.java

@@ -21,14 +21,22 @@ public interface ChargReceiveService {
 
     int updateByPrimaryKeySelective(ChargerReceive record);
 
+    /**
+     * 发货
+     * @param record
+     * @return
+     */
+    int ship(ChargerReceive record);
+
     /*按照orderId修改*/
     int updateByOrderId(ChargerReceive record);
 
     /*获取列表*/
     List<ChargerReceive> getChargerReceiveList(ChargerReceive chargerReceive);
 
-    /*分页*/
+    /*分页 -- 前台专用*/
     PagedResult<ChargerReceive> listChargerReceive(PageRequest<ChargerReceive> pageRequest);
 
-
+    /*分页 -- 后台专用*/
+    PagedResult<ChargerReceive> listAdminChargerReceive(PageRequest<ChargerReceive> pageRequest);
 }

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

@@ -19,6 +19,16 @@ public interface ChargerReceiveMapper {
 
     int updateByOrderId(ChargerReceive record);
 
-    /*获取列表*/
+    /**
+     * 发货
+     * @param record
+     * @return
+     */
+    int ship(ChargerReceive record);
+
+    /*获取列表 -- 前台专用*/
     List<ChargerReceive> listChargerReceive(ChargerReceive chargerReceive);
+
+    /*后台专用*/
+    List<ChargerReceive> listAdminChargerReceive(ChargerReceive chargerReceive);
 }

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

@@ -270,7 +270,17 @@
     where receive_order_id = #{receiveOrderId}
   </update>
 
+  <update id="ship" parameterType="ChargerReceive" >
+    update tb_iamberry_charger_receive
+    <set >
+        receive_post_firm = #{receivePostFirm,jdbcType=VARCHAR},
+        receive_post_num = #{receivePostNum,jdbcType=VARCHAR},
+        receive_status = #{receiveStatus,jdbcType=INTEGER}
+    </set>
+    where receive_id = #{receiveId}
+  </update>
 
+ <!-- 用于前台领取充电器功能 前台专用 */-->
   <select id="listChargerReceive" resultType="ChargerReceive" parameterType="ChargerReceive" >
        SELECT
             t.receive_id,
@@ -309,6 +319,7 @@
           <if test="colorId != null" >
             AND t.color_id = #{colorId}
           </if>
+
           <if test="receiveCreateTime != null and receiveCreateTime != ''" >
             AND  DATE_FORMAT(t.receive_create_time,'%Y') =  DATE_FORMAT(#{receiveCreateTime},'%Y')
           </if>
@@ -316,4 +327,58 @@
       ORDER BY t.receive_create_time
   </select>
 
+  <!-- 用于前台领取充电器功能 后台专用 */-->
+  <select id="listAdminChargerReceive" resultType="ChargerReceive" parameterType="ChargerReceive" >
+    SELECT
+    t.receive_id,
+    t.receive_order_id,
+    t.receive_open_id,
+    t.color_id,
+    t.color_name,
+    t.receive_address_info,
+    t.receive_address_postnum,
+    t.receive_address_name,
+    t.receive_address_tel,
+    t.receive_send_time,
+    t.receive_post_firm,
+    t.receive_post_num,
+    t.receive_postage,
+    t.receive_status,
+    t.receive_transaction_id,
+    t.receive_transaction_date,
+    t.receive_create_time,
+    t.receive_update_time,
+    iuu.user_nickname
+    FROM
+    tb_iamberry_charger_receive t
+    LEFT JOIN tb_iamberry_user_userinfo iuu ON t.receive_open_id = iuu.user_openid
+    <where>
+      <if test="userNickname != null and userNickname != ''" >
+        AND iuu.user_nickname LIKE CONCAT('%',#{userNickname},'%')
+      </if>
+      <if test="receiveStatus != null" >
+        AND t.receive_status = #{receiveStatus}
+      </if>
+      <if test="receiveId != null" >
+        AND t.receive_id = #{receiveId}
+      </if>
+      <if test="receiveOrderId != null  and receiveOrderId != ''" >
+        AND t.receive_order_id = #{receiveOrderId}
+      </if>
+      <if test="receiveOpenId != null and receiveOpenId != ''" >
+        AND t.receive_open_id = #{receiveOpenId}
+      </if>
+      <if test="colorId != null" >
+        AND t.color_id = #{colorId}
+      </if>
+      <if test="receiveAddressTel != null and receiveAddressTel != ''" >
+        AND t.receive_address_tel  LIKE CONCAT('%',#{receiveAddressTel},'%')
+      </if>
+      <if test="receivePostNum != null and receivePostNum != ''" >
+        AND t.receive_post_num = #{receivePostNum}
+      </if>
+    </where>
+    ORDER BY t.receive_create_time
+  </select>
+
 </mapper>

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

@@ -61,6 +61,7 @@
 			tb_iamberry_product_color 
 		WHERE 
 			color_product_id = #{colorProductId}
+			AND  color_status = 1
 	</select>
 	
 	<!-- 分页获取产品颜色列表 -->

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/receive/ChargReceiveServiceImpl.java

@@ -48,6 +48,11 @@ public class ChargReceiveServiceImpl implements ChargReceiveService {
     }
 
     @Override
+    public int ship(ChargerReceive record) {
+        return chargerReceiveMapper.ship(record);
+    }
+
+    @Override
     public int updateByOrderId(ChargerReceive record) {
         return chargerReceiveMapper.updateByOrderId(record);
     }
@@ -64,4 +69,11 @@ public class ChargReceiveServiceImpl implements ChargReceiveService {
         return PageUtil.getPage(detedctList);
     }
 
+    @Override
+    public PagedResult<ChargerReceive> listAdminChargerReceive(PageRequest<ChargerReceive> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<ChargerReceive> detedctList = chargerReceiveMapper.listAdminChargerReceive(pageRequest.getData());
+        return PageUtil.getPage(detedctList);
+    }
+
 }

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

@@ -0,0 +1,84 @@
+package com.iamberry.wechat.handles.admin;
+
+import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.integral.UseIntegral;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+import com.iamberry.wechat.core.entity.receive.ChargerReceive;
+import com.iamberry.wechat.face.receive.ChargReceiveService;
+import com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.tools.ResultInfo;
+import com.iamberry.wechat.utils.StitchAttrUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+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;
+
+/**
+ * 免费领取充电器
+ * Created by wxm on 2017/10/11.
+ */
+@Controller
+@RequestMapping("/admin/receive")
+public class AdminChargReceiveHandler {
+
+    @Autowired
+    private ChargReceiveService chargReceiveService;
+
+    /**
+     * 查询积分记录 并分页 (支持查询条件模糊搜索)
+     * 2018年2月24日
+     * @author mzx
+     * @param pageNO	分页信息
+     * @return
+     */
+    @RequestMapping("/listReceive")
+    public ModelAndView listIntegral(ChargerReceive chargerReceive,
+                                     @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
+                                     @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
+                                     @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum,
+                                     HttpServletRequest request) throws Exception {
+        ModelAndView mv = new ModelAndView("admin/receive/listReceive");
+        // 封装请求数据
+        PageRequest<ChargerReceive> pageRequest = new PageRequest<>(chargerReceive, pageNO, pageSize, totalNum == 0);
+        // 查询订单列表
+        PagedResult<ChargerReceive> result = chargReceiveService.listAdminChargerReceive(pageRequest);
+        if (totalNum != 0) {
+            result.setTotal(totalNum);
+        }
+        StitchAttrUtil.setModelAndView(chargerReceive, mv, "/admin/receive/listReceive", result);
+        return mv;
+    }
+
+    /**
+     * 发货
+     * 2018年2月24日
+     * @author mzx
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/ship")
+    public ResultMsg ship(ChargerReceive chargerReceive,HttpServletRequest request) throws Exception {
+        ResultMsg msg = new ResultMsg();
+
+        if(chargerReceive.getReceiveId() == null  || chargerReceive.getReceivePostFirm() == null || "".equals(chargerReceive.getReceivePostFirm())
+                || chargerReceive.getReceivePostNum() == null || "".equals(chargerReceive.getReceivePostNum())){
+            msg.setMessage(NameUtils.getConfig("ERRORCODE"));
+            msg.setResultCode(ResultInfo.ERRORCODE);
+            msg.setStatus(false);
+        }
+        chargerReceive.setReceiveStatus(3);
+        Integer flag = chargReceiveService.ship(chargerReceive);
+
+        msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setStatus(true);
+        return msg;
+    }
+
+
+}

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -345,7 +345,8 @@ public class OrderHandler {
 //		String element = systemService.selectOneShopRuleById(249).getRuleDesc();
 		String brushelEment = systemService.selectOneShopRuleById(253).getRuleDesc();
 
-		int brushelTotal = 0; // 牙刷总金额
+//		int brushelTotal = 0; // 牙刷总金额
+		int brushelCouponTotal = 0;  //优惠总价
 
 		int total = 0; // 需要支付的总额, 单位为分
 		/** 提前准备订单项数据 */
@@ -382,7 +383,10 @@ public class OrderHandler {
 				for(String brushelEl : brushelEls){
 					if(cartDto.getProductType() == Integer.valueOf(brushelEl)){		//判断订单中是否有刷头，有刷头 brushFlag 为true；
 						brushFlag = true;
-						brushelTotal += subTotal;
+//						brushelTotal += subTotal;
+						if(brushelCouponTotal == 0 || brushelCouponTotal < cartDto.getProductPrice()){
+							brushelCouponTotal = cartDto.getProductPrice();
+						}
 					}
 				}
 
@@ -442,16 +446,17 @@ public class OrderHandler {
 					return msg;
 				}
 			}
-			int br = 0;
+//			int br = 0;
 			//优惠券的类型，是直接减免额度 还是折扣价
 			if(couponType.getCouponType()==1){
 				if(couponItemDto.getCouponIsNewPeople() == 1){  //当券为新人券
-					br = brushelTotal - couponType.getCouponReduce();
-					if(br <= 0){
-						total=total-brushelTotal;
-					}else{
-						total=total-couponType.getCouponReduce();
-					}
+					total = total - brushelCouponTotal;
+//					br = brushelTotal - couponType.getCouponReduce();
+//					if(br <= 0){
+//						total=total-brushelTotal;
+//					}else{
+//						total=total-couponType.getCouponReduce();
+//					}
 				}else{
 					total=total-couponType.getCouponReduce();
 				}

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/receive/ChargReceiveHandler.java

@@ -70,7 +70,6 @@ public class ChargReceiveHandler {
 									 ) throws Exception {
 		ResultMsg remsg=new ResultMsg();
 		String openId  = WechatUtils.getUserBySession(request).getUserOpenid();
-//		String openId  = myOpenId;
 
 		ChargerReceive chargerReceive = new ChargerReceive();
 		chargerReceive.setReceiveOpenId(openId);
@@ -86,17 +85,21 @@ public class ChargReceiveHandler {
 
 		/*验证是否可以领取*/
 		Boolean isReceive = false;
+		Integer pickingNumber = 0;
 		ChargerReceive verificaCR = new ChargerReceive();
 		verificaCR.setReceiveOpenId(openId);
 		verificaCR.setReceiveCreateTime(new Date());
 		List<ChargerReceive> chargerReceiveList = chargReceiveService.getChargerReceiveList(verificaCR);
 		if(chargerReceiveList == null || chargerReceiveList.size() < 1){
 			isReceive = true;
+		}else{
+			pickingNumber = chargerReceiveList.size();
 		}
 
 		Map<String,Object> map = new HashMap<String, Object>();
 		map.put("list",result.getDataList());
 		map.put("isReceive",isReceive);
+		map.put("pickingNumber",pickingNumber);
 
 		remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 		remsg.setResultCode(ResultInfo.SUCCESSCODE);
@@ -118,7 +121,6 @@ public class ChargReceiveHandler {
 		ResultMsg remsg=new ResultMsg();
 		String openId  = WechatUtils.getUserBySession(request).getUserOpenid();
 
-//		String openId  = myOpenId;
 		Member member = memberService.getMemberByUserOpenId(openId); // 当前用户
 		chargerReceive.setReceiveOpenId(openId);
 
@@ -141,14 +143,16 @@ public class ChargReceiveHandler {
 		verificaCR.setReceiveOpenId(openId);
 		verificaCR.setReceiveCreateTime(new Date());
 		List<ChargerReceive> chargerReceiveList = chargReceiveService.getChargerReceiveList(verificaCR);
+		Integer num = 2000;
 		if(chargerReceiveList == null || chargerReceiveList.size() < 1){
+			num = Integer.valueOf(systemService.selectOneShopRuleById(254).getRuleNum().intValue());	//10
+		}else{
+			num = Integer.valueOf(systemService.selectOneShopRuleById(255).getRuleNum().intValue()); 	//20
+		}
+
+		if(true){
 			String orderId = OrderNOUtil.createOrderCode(member.getUserId());
 			chargerReceive.setReceiveOrderId("mflq" + orderId);
-
-			Integer num = Integer.valueOf(systemService.selectOneShopRuleById(253).getRuleNum().intValue());
-			if(num == null){
-				num = 1000;
-			}
 			chargerReceive.setReceivePostage(num);
 			chargerReceive.setReceiveStatus(1);	//1:代付款  2:已付款 3:已发货
 			Integer flag = chargReceiveService.insert(chargerReceive);
@@ -192,6 +196,48 @@ public class ChargReceiveHandler {
 
 	/**
 	 *
+	 * 查询价格
+	 * @param request
+	 * @return ResultMsg
+	 * @throws Exception
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/select_charg_price")
+	public  ResultMsg getChargPrice(HttpServletRequest request) throws Exception {
+		ResultMsg remsg=new ResultMsg();
+		String openId  = WechatUtils.getUserBySession(request).getUserOpenid();
+		/*验证今年是否已经领过了*/
+		Boolean isReceive = false;
+		Integer pickingNumber = 0;
+		ChargerReceive verificaCR = new ChargerReceive();
+		verificaCR.setReceiveOpenId(openId);
+		verificaCR.setReceiveCreateTime(new Date());
+		List<ChargerReceive> chargerReceiveList = chargReceiveService.getChargerReceiveList(verificaCR);
+		if(chargerReceiveList == null || chargerReceiveList.size() < 1){
+			isReceive = true;
+		}else{
+			pickingNumber = chargerReceiveList.size();
+		}
+		Integer num = 2000;
+		if(isReceive){	//可以免费领取
+			num = Integer.valueOf(systemService.selectOneShopRuleById(254).getRuleNum().intValue());
+		}else{
+			num = Integer.valueOf(systemService.selectOneShopRuleById(255).getRuleNum().intValue());
+		}
+
+		Map<String,Object> map = new HashMap<>();
+		map.put("pickingNumber",pickingNumber);
+		map.put("price",num);
+
+		remsg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		remsg.setResultCode(ResultInfo.SUCCESSCODE);
+		remsg.setStatus(true);
+		remsg.setData(map);
+		return remsg;
+	}
+
+	/**
+	 *
 	 * 查询是否支付成功
 	 * @param request
 	 * @return ResultMsg

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/receive/listReceive.jsp

@@ -0,0 +1,261 @@
+<%@ 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" %>
+<!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" />
+    <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>
+<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">
+    <form action="${pageContext.request.contextPath }/admin/receive/listReceive" method="post" style="text-align: center;margin-bottom: 10px;">
+
+        <input name="userNickname" id="userNickname" value="${userNickname }" placeholder="微信昵称" style="width: 150px" class="input-text" type="text">
+        <input name="receiveAddressTel" id="receiveAddressTel" value="${receiveAddressTel }" placeholder="手机号码" style="width: 150px" class="input-text" type="text">
+        <input name="receivePostNum" id="receivePostNum" value="${receivePostNum }" placeholder="物流编号" style="width: 150px" class="input-text" type="text">
+
+        <span class="select-box" style="width: 150px">
+            <select id="receiveStatus" name="receiveStatus" class="select">
+                <option value="" >订单状态</option>
+                <option value="1" ${receiveStatus==1?'selected':''}>待付款</option>
+                <option value="2" ${receiveStatus==2?'selected':''}>已付款(待发货)</option>
+                <option value="3" ${receiveStatus==3?'selected':''}>已发货</option>
+            </select>
+        </span>
+
+        <button name="" id="submitBtn" class="btn btn-success" type="submit">
+            <i class="Hui-iconfont"></i> 搜索
+        </button>
+    </form>
+    <form id="goodsform" >
+        <table class="table table-border table-bordered table-bg">
+            <thead>
+            <tr>
+                <th scope="col" colspan="13">充电器领取列表</th>
+            </tr>
+            <tr class="text-c">
+                <th width="150">订单号</th>
+                <th width="150">微信昵称</th>
+                <th width="100">状态</th>
+                <th width="80">颜色</th>
+                <th width="80">金额</th>
+                <th width="100">姓名</th>
+                <th width="180">收货地址</th>
+                <th width="90">手机号码</th>
+                <th width="90">物流公司</th>
+                <th width="90">物流单号</th>
+                <th width="100">创建时间</th>
+                <th width="100">操作</th>
+            </tr>
+            </thead>
+            <tbody>
+            <c:if test="${! (empty page.dataList) }">
+                <c:forEach items="${page.dataList }" var="infolist">
+                <tr class="text-c">
+                    <td>${infolist.receiveOrderId }</td>
+                    <td>${infolist.userNickname }</td>
+                    <td>
+                        <c:if test="${infolist.receiveStatus == 1 }">
+                            待付款
+                        </c:if>
+                        <c:if test="${infolist.receiveStatus == 2 }">
+                            已付款(待发货)
+                        </c:if>
+                        <c:if test="${infolist.receiveStatus == 3 }">
+                            已发货
+                        </c:if>
+                    </td>
+                    <td>${infolist.colorName }</td>
+                    <td>
+                        <fmt:formatNumber type="number" value="${infolist.receivePostage/100}" pattern="0.00" maxFractionDigits="2"/>
+                    </td>
+                    <td>${infolist.receiveAddressName}</td>
+                    <td>${infolist.receiveAddressInfo}</td>
+                    <td>${infolist.receiveAddressTel}</td>
+                    <%--<td><fmt:formatDate value="${infolist.receiveSendTime}" pattern="yyyy-MM-dd"/></td>--%>
+                    <td>
+                        <c:choose>
+                            <c:when test="${infolist.receivePostFirm == 'sto' }">申通快递</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'yto' }">圆通快递</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'sf' }">顺丰快递</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'ems' }">邮政EMS</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'zto' }">中通快递</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'zjs' }">宅急送</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'yunda' }">韵达快递</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'cces' }">cces快递</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'pick' }">上门提货</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'htky' }">汇通快递</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'ttkdex' }">天天快递</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'stars' }">星晨急便</c:when>
+                            <c:when test="${infolist.receivePostFirm == 'jd' }">京东快递</c:when>
+                            <c:when test="${infolist.receivePostFirm == '01' }">其他</c:when>
+                            <c:when test="${infolist.receivePostFirm == '02' }">上门送货</c:when>
+                        </c:choose>
+                    </td>
+                    <td>${infolist.receivePostNum}</td>
+                    <td><fmt:formatDate value="${infolist.receiveCreateTime}" pattern="yyyy-MM-dd"/></td>
+                    <td>
+                        <c:if test="${infolist.receiveStatus == 2 }">
+                            <a href="javascript:void(0)" lang="发货" title="发货" alt="发货" onclick="ship(${infolist.receiveId })">
+                                <i class="Hui-iconfont">&#xe627;</i>
+                            </a>
+                        </c:if>
+                        <c:if test="${infolist.receiveStatus == 1 || infolist.receiveStatus == 3 }">
+                           -
+                        </c:if>
+                    </td>
+                 </c:forEach>
+             </c:if>
+                <c:if test="${empty page.dataList}">
+                    <tr align="center"><td colspan="13" style="text-align: center;">未查询到该类数据!</td></tr>
+                </c:if>
+            </tbody>
+        </table>
+        <div align="right" class="mt-10 mb-10 mr-10">
+            <%@include file="/common/other/paper/pager.jsp"%>
+        </div>
+    </form>
+</div>
+
+
+<div class="layui-layer layui-anim layui-layer-iframe" id="layui-layer4" times="4" showtime="0" contype="string" style="display:none;z-index: 2; width: 400px; height: 260px; position: absolute; top: 100px; left: 379px;">
+    <form action="#" method="post" class="form form-horizontal" id="form-admin-add">
+        <input type="hidden" id="shopReceiveId" name="shopReceiveId" value="">
+        <div class="layui-layer-title" id="sendOrderDivTitle" style="cursor: move;" move="ok">确认发货</div>
+        <br>
+        <div class="row cl">
+            <label class="form-label col-3"><span class="c-red"></span>&nbsp;&nbsp;物流编号：</label>
+            <div class="formControls col-5">
+                <input type="text" id="order-post-num-id" class="input-text" value="" placeholder="请输入物流编号" name="postNum" datatype="*2-16" nullmsg="用户名不能为空">
+            </div>
+            <div class="col-4"> </div>
+        </div>
+        <br>
+        <div class="row cl">
+            <label class="form-label col-3"><span class="c-red"></span>&nbsp;&nbsp;物流公司：</label>
+            <div class="formControls col-5"> <span class="select-box" style="width:150px;">
+				<select class="select" name="postFirm" size="1" id="postFirm">
+					<option value="">请选择物流公司</option>
+					<option value="sto">申通快递</option>
+					<option value="yto">圆通快递</option>
+					<option value="sf">顺丰快递</option>
+					<option value="ems">邮政EMS</option>
+					<option value="zto">中通快递</option>
+					<option value="zjs">宅急送</option>
+					<option value="yunda">韵达快递</option>
+					<option value="cces">cces快递</option>
+					<option value="pick">上门提货</option>
+					<option value="htky">汇通快递</option>
+					<option value="ttkdex">天天快递</option>
+					<option value="stars">星晨急便</option>
+					<option value="jd">京东快递</option>
+					<option value="01">其他</option>
+					<option value="02">上门送货</option>
+				</select>
+				</span> </div>
+        </div>
+        <br>
+        <div class="col-9 col-offset-3">
+            <input class="btn btn-danger" onclick="return shipPost(this)" type="submit" 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>
+
+<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">
+    /* $(document).ready(function(){
+     $('#beginDate').datepicker();//时间控件
+     $('#endDate').datepicker();
+     }); */
+    /**
+     * 发货
+     * @param receiveId
+     */
+    function  ship(receiveId){
+        $("#layui-layer4").show();
+        $("#shopReceiveId").val(receiveId);
+    }
+
+    /**
+     * 发货
+     * @param receiveId
+     */
+    function  shipPost(node){
+        var url = "${pageContext.request.contextPath }" + '/admin/receive/ship';
+        var receiveId = $('#shopReceiveId').val();
+        var receivePostNum = $('#order-post-num-id').val();
+        var receivePostFirm = $('#postFirm').val();
+        if (receivePostNum == null || receivePostNum == '') {
+            layer.msg("请填写物流编号！",{icon: 5,time:2000});
+            return false;
+        }
+        if (receivePostFirm == null || receivePostFirm == '') {
+            layer.msg("请选择物流公司！",{icon: 5,time:2000});
+            return false;
+        }
+        $.ajax({
+            type: "POST",
+            url: url,
+            traditional : true,
+            data: {
+                receiveId : receiveId,
+                receivePostFirm : receivePostFirm,
+                receivePostNum : receivePostNum
+            },
+            dataType: "json",
+            success: function(data){
+                if(data.status){
+                    exitWindowsDiv(node);
+                    layer.msg("发货成功！",{icon: 5,time:2000});
+                    return false;
+                }else{
+                    layer.msg("发货失败，请重试！",{icon: 5,time:2000});
+                    return false;
+                }
+            }
+        });
+    }
+
+    // 关闭窗口
+    function exitWindowsDiv(_this) {
+        $(_this).parent().parent().hide();
+    }
+</script>
+</body>
+</html>