Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrderItem.java

@@ -30,6 +30,8 @@ public class SalesOrderItem implements Serializable {
 
     private Integer colorIsWeight;    //重量
 
+    private Integer colorIsMachine; //是否是水机 1:水机 2;其它产品
+
     public Integer getItemIsSource() {
         return itemIsSource;
     }
@@ -165,4 +167,12 @@ public class SalesOrderItem implements Serializable {
     public void setColorIsWeight(Integer colorIsWeight) {
         this.colorIsWeight = colorIsWeight;
     }
+
+    public Integer getColorIsMachine() {
+        return colorIsMachine;
+    }
+
+    public void setColorIsMachine(Integer colorIsMachine) {
+        this.colorIsMachine = colorIsMachine;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/order/ProductColor.java

@@ -43,6 +43,8 @@ public class ProductColor implements Serializable {
 
     private Integer colorIsWeight;    //重量
 
+    private Integer colorIsMachine; //是否是水机 1:水机 2;其它产品
+
     public String getProductName() {
         return productName;
     }
@@ -155,6 +157,14 @@ public class ProductColor implements Serializable {
         this.colorIsWeight = colorIsWeight;
     }
 
+    public Integer getColorIsMachine() {
+        return colorIsMachine;
+    }
+
+    public void setColorIsMachine(Integer colorIsMachine) {
+        this.colorIsMachine = colorIsMachine;
+    }
+
     @Override
     public String toString() {
         return "ProductColor{" +

watero-rst-core/src/main/java/com.iamberry.rst.core/order/ProvincesLogistics.java

@@ -0,0 +1,100 @@
+package com.iamberry.rst.core.order;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  省指定快递公司信息表类
+ * @author
+ * @Date 2018-10-31
+ */
+public class ProvincesLogistics  implements  Serializable{
+    private static final long serialVersionUID = -1558408351794349742L;
+    //
+    private Integer provincesLogisticsId;
+    //省id
+    private Integer provinceId;
+    //物流id
+    private Integer logisticsId;
+    //修改时间'
+    private Date provincesLogisticsUpdateTime;
+
+    private String logisticsName;//物流公司名称
+    private String logisticsRstCode;//rst物流公司代码
+    private String logisticsEfastCode;//Efast物流公司代码
+    private String logisticsOnehundredCode;//快递100物流公司代码
+
+    //省
+    private String province;
+
+    public Integer getProvincesLogisticsId(){
+        return provincesLogisticsId;
+    }
+
+    public void setProvincesLogisticsId(Integer  provincesLogisticsId){
+        this.provincesLogisticsId=provincesLogisticsId;
+    }
+
+    public Integer getProvinceId(){
+        return provinceId;
+    }
+
+    public void setProvinceId(Integer  provinceId){
+        this.provinceId=provinceId;
+    }
+
+    public Integer getLogisticsId(){
+        return logisticsId;
+    }
+
+    public void setLogisticsId(Integer  logisticsId){
+        this.logisticsId=logisticsId;
+    }
+
+    public Date getProvincesLogisticsUpdateTime(){
+        return provincesLogisticsUpdateTime;
+    }
+
+    public void setProvincesLogisticsUpdateTime(Date  provincesLogisticsUpdateTime){
+        this.provincesLogisticsUpdateTime=provincesLogisticsUpdateTime;
+    }
+
+    public String getLogisticsName() {
+        return logisticsName;
+    }
+
+    public void setLogisticsName(String logisticsName) {
+        this.logisticsName = logisticsName;
+    }
+
+    public String getLogisticsRstCode() {
+        return logisticsRstCode;
+    }
+
+    public void setLogisticsRstCode(String logisticsRstCode) {
+        this.logisticsRstCode = logisticsRstCode;
+    }
+
+    public String getLogisticsEfastCode() {
+        return logisticsEfastCode;
+    }
+
+    public void setLogisticsEfastCode(String logisticsEfastCode) {
+        this.logisticsEfastCode = logisticsEfastCode;
+    }
+
+    public String getLogisticsOnehundredCode() {
+        return logisticsOnehundredCode;
+    }
+
+    public void setLogisticsOnehundredCode(String logisticsOnehundredCode) {
+        this.logisticsOnehundredCode = logisticsOnehundredCode;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -109,6 +109,14 @@ public interface SalesOrderService {
      */
     PagedResult<SalesOrder> listAwaitSendSalesOrderPage(int pageNO, int pageSize, SalesOrder salesOrder, boolean isTotalNum);
 
+
+    /**
+     * 根据省份来分配物流公司
+     * @param listSalesOrder
+     * @return
+     */
+    void setProvincesLogistics(List<SalesOrder> listSalesOrder);
+
     /**
      * 获取订单项集合
      * @param salesOrderItem
@@ -296,5 +304,17 @@ public interface SalesOrderService {
      */
     Integer updateDeliver(SalesOrder salesOrder);
 
+    /**
+     * 获取出库数量
+     * @param salesOrder
+     * @return
+     */
+    Integer getDeliverNum(SalesOrder salesOrder);
 
+    /**
+     * 查询订单集合与订单项集合
+     * @param salesOrder
+     * @return
+     */
+    List<SalesOrder> salesOrderListAndItem(SalesOrder salesOrder);
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/order/ProvincesLogisticsService.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.faces.order;
+
+import com.iamberry.rst.core.order.ProvincesLogistics;
+
+import java.util.List;
+
+/**
+ *  省指定快递公司信息表接口
+ * @author
+ * @Date 2018-10-31
+ */
+public interface ProvincesLogisticsService {
+    /**
+     * 获取集合
+     * @param  provincesLogistics
+     * @return List
+     */
+    List<ProvincesLogistics> getProvincesLogisticsList(ProvincesLogistics  provincesLogistics);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  provincesLogistics
+     */
+    ProvincesLogistics  getProvincesLogisticsById(Integer  id);
+    /**
+     * 增加数据
+     * @param  provincesLogistics
+     * @return Integer
+     */
+    Integer  save(ProvincesLogistics  provincesLogistics);
+    /**
+     * 修改数据
+     * @param  provincesLogistics
+     * @return Integer
+     */
+    Integer  update(ProvincesLogistics  provincesLogistics);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/product/ProductService.java

@@ -112,4 +112,10 @@ public interface ProductService {
      * @return
      */
     FittingsInfo getFittingsBySku(String colorBar);
+
+    /**
+     * 根据sku查询颜色信息
+     * @return
+     */
+    ProductColor getColorByBar(String colorBar);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -1,23 +1,24 @@
 package com.iamberry.rst.service.cm;
 
 import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.address.Province;
 import com.iamberry.rst.core.cm.FittingsInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.cm.StoreInfo;
-import com.iamberry.rst.core.order.DownsingleRuleInfo;
-import com.iamberry.rst.core.order.DownsingleRuleItemInfo;
-import com.iamberry.rst.core.order.PostInfo;
-import com.iamberry.rst.core.order.ProductColor;
+import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.SysConfig;
 import com.iamberry.rst.core.tools.LogisticsInfo;
+import com.iamberry.rst.faces.address.AddressService;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.cm.StoreInfoService;
 import com.iamberry.rst.faces.order.EfastOrderService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.service.cm.mapper.FittingsInfoMapper;
 import com.iamberry.rst.service.cm.mapper.SalesOrderMapper;
+import com.iamberry.rst.service.order.mapper.LogisticsInfoMapper;
+import com.iamberry.rst.service.order.mapper.ProvincesLogisticsMapper;
 import com.iamberry.rst.service.sys.mapper.SysConfigMapper;
 import com.iamberry.rst.util.PageUtil;
 import com.iamberry.wechat.tools.DateTimeUtil;
@@ -55,6 +56,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     private FittingsInfoMapper fittingsInfoMapper;
     @Autowired
     private SysConfigMapper sysConfigMapper;
+    @Autowired
+    private AddressService addressService;
+    @Autowired
+    private ProvincesLogisticsMapper provincesLogisticsMapper;
+
 
     @Override
     public Integer addSalesOrder(SalesOrder salesOrder) {
@@ -329,6 +335,10 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         salesOrderService.parseOrder(salesOrder, listSalesOrder);
         //匹配拆单规则 分割订单-------------end
         boolean msg = false;
+
+        /*根据省份来分配物流公司*/
+        salesOrderService.setProvincesLogistics(listSalesOrder);
+
         //判断主从订单--------------------state
         if (listSalesOrder.size() > 0){
             SalesOrder mainOrder = null;
@@ -348,8 +358,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 mainOrder = listSalesOrder.get(0);
                 listSalesOrder.remove(0);
             }
-
             //判断主从订单--------------------end
+
              msg = salesOrderService.addRstOrderinfo(mainOrder,listSalesOrder);
         }
         return msg;
@@ -363,6 +373,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             throw  new RuntimeException("交易号("+ mainOrder.getSalesDealCode() +")重复，请重新生成交易号！");
         }
 
+        if(mainOrder.getSalesCreateTime() == null){
+            /*保证时间与以前一样*/
+            mainOrder.setSalesCreateTime(new Date());
+        }
+
         int orderNum = salesOrderMapper.addSalesOrder(mainOrder);
         if (orderNum <= 0) {
             throw  new RuntimeException("添加订单出错--------！");
@@ -398,6 +413,51 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return true;
     }
 
+    /**
+     * 根据省份来分配物流公司
+     * @param listSalesOrder
+     * @return
+     */
+    @Override
+    public void setProvincesLogistics(List<SalesOrder> listSalesOrder){
+        for (SalesOrder salesOrder:listSalesOrder) {
+            boolean flag = false;
+            for (SalesOrderItem salesOrderItem:salesOrder.getSalesOrderItemList()) {
+                ProductColor productColor = productService.getColorByBar(salesOrderItem.getItemColorBar());
+                if(productColor.getColorIsMachine() == 1){
+                    flag = true;
+                }
+            }
+            if(flag){
+                String addresses[] = salesOrder.getSalesAddressInfo().split("-");
+                if(addresses == null || addresses.length < 3){
+                    addresses = salesOrder.getSalesAddressInfo().split(" ");
+                }
+                if(addresses == null || addresses.length < 3){
+                    addresses = salesOrder.getSalesAddressInfo().split("_");
+                }
+                if(addresses == null || addresses.length < 3){
+                    break;
+                }
+                String provincesStr = addresses[0];
+                provincesStr = provincesStr.substring(0,2);
+
+                ProvincesLogistics provincesLogistics = new ProvincesLogistics();
+                provincesLogistics.setProvince(provincesStr);
+                List<ProvincesLogistics> provincesLogisticsList = provincesLogisticsMapper.getProvincesLogisticsList(provincesLogistics);
+                if(provincesLogisticsList == null || provincesLogisticsList.size() < 1){
+                    /*未查到地址*/
+                    break;
+                }
+                //设置快递公司
+                provincesLogistics = provincesLogisticsList.get(0);
+                if(provincesLogistics.getLogisticsRstCode() != null){
+                    salesOrder.setSalesPostFirm(provincesLogistics.getLogisticsRstCode());
+                }
+            }
+        }
+    }
+
     @Override
     public List<SalesOrderItem> listSalesOrderItem(SalesOrderItem salesOrderItem) {
         return salesOrderMapper.listSalesOrderItem(salesOrderItem);
@@ -927,5 +987,15 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return salesOrderMapper.updateDeliver(salesOrder);
     }
 
+    @Override
+    public Integer getDeliverNum(SalesOrder salesOrder) {
+        return salesOrderMapper.getDeliverNum(salesOrder);
+    }
+
+    @Override
+    public List<SalesOrder> salesOrderListAndItem(SalesOrder salesOrder) {
+        return salesOrderMapper.salesOrderListAndItem(salesOrder);
+    }
+
 
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/SalesOrderMapper.java

@@ -252,4 +252,18 @@ public interface SalesOrderMapper {
      */
     Integer updateDeliver(SalesOrder salesOrder);
 
+    /**
+     * 获取出库数量
+     * @param salesOrder
+     * @return
+     */
+    Integer getDeliverNum(SalesOrder salesOrder);
+
+    /**
+     * 查询订单集合与订单项集合
+     * @param salesOrder
+     * @return
+     */
+    List<SalesOrder> salesOrderListAndItem(SalesOrder salesOrder);
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -285,100 +285,95 @@
     FROM
     tb_rst_customer_info c
     LEFT JOIN (
-    (
-    SELECT
-    '3' AS customerIsSolve,
-    renewed_id AS relationId,
-    customer_id AS customerId,
-    tb_rst_relation_order.sales_id AS orderId,
-    signclosed_id AS signclosedId,
-    renewed_back_status AS relationBackStatus,
-    renewed_send_status AS relationSendStatus,
-    renewed_send_logistics_no AS relationSendLogisticsNo,
-    renewed_send_logistics_company AS relationSendLogisticsCompany,
-    renewed_back_logistics_no AS relationBackLogisticsNo,
-    renewed_back_logistics_company AS relationBackLogisticsCompany
-    FROM
-    tb_rst_renewed
-    LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_renewed.renewed_id
-    AND tb_rst_relation_order.relation_type = '3'
-    )
-    UNION ALL
-    (
-    SELECT
-    '4' AS customerIsSolve,
-    repair_id AS relationId,
-    customer_id AS customerId,
-    tb_rst_relation_order.sales_id AS orderId,
-    signclosed_id AS signclosedId,
-    repair_back_status AS relationBackStatus,
-    repair_send_status AS relationSendStatus,
-    repair_send_logistics_no AS relationSendLogisticsNo,
-    repair_send_logistics_company AS relationSendLogisticsCompany,
-    repair_back_logistics_no AS relationBackLogisticsNo,
-    repair_back_logistics_company AS relationBackLogisticsCompany
-    FROM
-    tb_rst_repair
-    LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_repair.repair_id
-    AND tb_rst_relation_order.relation_type = '4'
-    )
-    UNION ALL
-    (
-    SELECT
-    '5' AS customerIsSolve,
-    reissue_id AS relationId,
-    customer_id AS customerId,
-    tb_rst_relation_order.sales_id AS orderId,
-    NULL AS signclosedId,
-    NULL AS relationBackStatus,
-    reissue_send_status AS relationSendStatus,
-    reissue_send_logistics_no AS relationSendLogisticsNo,
-    reissue_send_logistics_company AS relationSendLogisticsCompany,
-    NULL AS relationBackLogisticsNo,
-    NULL AS relationBackLogisticsCompany
-    FROM
-    tb_rst_reissue
-    LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_reissue.reissue_id
-    AND tb_rst_relation_order.relation_type = '5'
-    )
-    UNION ALL
-    (
-    SELECT
-    '6' AS customerIsSolve,
-    back_goods_id AS relationId,
-    customer_id AS customerId,
-    tb_rst_relation_order.sales_id AS orderId,
-    signclosed_id AS signclosedId,
-    back_goods_back_status AS relationBackStatus,
-    NULL AS relationSendStatus,
-    NULL AS relationSendLogisticsNo,
-    NULL AS relationSendLogisticsCompany,
-    back_goods_back_logistics_no AS relationBackLogisticsNo,
-    back_goods_back_logistics_company AS relationBackLogisticsCompany
-    FROM
-    tb_rst_back_goods
-    LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_back_goods.back_goods_id
-    AND tb_rst_relation_order.relation_type = '6'
-    )
-    UNION ALL
-    (
-    SELECT
-    '7' AS customerIsSolve,
-    noreason_back_id AS relationId,
-    customer_id AS customerId,
-    tb_rst_relation_order.sales_id AS orderId,
-    signclosed_id AS signclosedId,
-    noreason_back_back_status AS relationBackStatus,
-    NULL AS relationSendStatus,
-    NULL AS relationSendLogisticsNo,
-    NULL AS relationSendLogisticsCompany,
-    noreason_back_back_logistics_no AS relationBackLogisticsNo,
-    noreason_back_back_logistics_company AS relationBackLogisticsCompany
-    FROM
-    tb_rst_noreason_back
-    LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_noreason_back.noreason_back_id
-    AND tb_rst_relation_order.relation_type = '7'
-    )
+      SELECT
+        xx.*
+      FROM
+        (
+          SELECT
+          '3' AS customerIsSolve,
+          renewed_id AS relationId,
+          customer_id AS customerId,
+          tb_rst_relation_order.sales_id AS orderId,
+          signclosed_id AS signclosedId,
+          renewed_back_status AS relationBackStatus,
+          renewed_send_status AS relationSendStatus,
+          renewed_send_logistics_no AS relationSendLogisticsNo,
+          renewed_send_logistics_company AS relationSendLogisticsCompany,
+          renewed_back_logistics_no AS relationBackLogisticsNo,
+          renewed_back_logistics_company AS relationBackLogisticsCompany
+          FROM
+            tb_rst_renewed
+          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_renewed.renewed_id
+          AND tb_rst_relation_order.relation_type = '3'
+        UNION ALL
+          SELECT
+          '4' AS customerIsSolve,
+          repair_id AS relationId,
+          customer_id AS customerId,
+          tb_rst_relation_order.sales_id AS orderId,
+          signclosed_id AS signclosedId,
+          repair_back_status AS relationBackStatus,
+          repair_send_status AS relationSendStatus,
+          repair_send_logistics_no AS relationSendLogisticsNo,
+          repair_send_logistics_company AS relationSendLogisticsCompany,
+          repair_back_logistics_no AS relationBackLogisticsNo,
+          repair_back_logistics_company AS relationBackLogisticsCompany
+          FROM
+          tb_rst_repair
+          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_repair.repair_id
+          AND tb_rst_relation_order.relation_type = '4'
+        UNION ALL
+          SELECT
+          '5' AS customerIsSolve,
+          reissue_id AS relationId,
+          customer_id AS customerId,
+          tb_rst_relation_order.sales_id AS orderId,
+          NULL AS signclosedId,
+          NULL AS relationBackStatus,
+          reissue_send_status AS relationSendStatus,
+          reissue_send_logistics_no AS relationSendLogisticsNo,
+          reissue_send_logistics_company AS relationSendLogisticsCompany,
+          NULL AS relationBackLogisticsNo,
+          NULL AS relationBackLogisticsCompany
+          FROM
+          tb_rst_reissue
+          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_reissue.reissue_id
+          AND tb_rst_relation_order.relation_type = '5'
+        UNION ALL
+          SELECT
+          '6' AS customerIsSolve,
+          back_goods_id AS relationId,
+          customer_id AS customerId,
+          tb_rst_relation_order.sales_id AS orderId,
+          signclosed_id AS signclosedId,
+          back_goods_back_status AS relationBackStatus,
+          NULL AS relationSendStatus,
+          NULL AS relationSendLogisticsNo,
+          NULL AS relationSendLogisticsCompany,
+          back_goods_back_logistics_no AS relationBackLogisticsNo,
+          back_goods_back_logistics_company AS relationBackLogisticsCompany
+          FROM
+          tb_rst_back_goods
+          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_back_goods.back_goods_id
+          AND tb_rst_relation_order.relation_type = '6'
+        UNION ALL
+          SELECT
+          '7' AS customerIsSolve,
+          noreason_back_id AS relationId,
+          customer_id AS customerId,
+          tb_rst_relation_order.sales_id AS orderId,
+          signclosed_id AS signclosedId,
+          noreason_back_back_status AS relationBackStatus,
+          NULL AS relationSendStatus,
+          NULL AS relationSendLogisticsNo,
+          NULL AS relationSendLogisticsCompany,
+          noreason_back_back_logistics_no AS relationBackLogisticsNo,
+          noreason_back_back_logistics_company AS relationBackLogisticsCompany
+          FROM
+          tb_rst_noreason_back
+          LEFT JOIN tb_rst_relation_order ON tb_rst_relation_order.relation_id = tb_rst_noreason_back.noreason_back_id
+          AND tb_rst_relation_order.relation_type = '7'
+      ) xx
     ) cc ON cc.customerId = c.customer_id
     LEFT JOIN tb_rst_visit v ON v.customer_id = c.customer_id
     LEFT JOIN tb_rst_sales_order_info oi ON cc.orderId = oi.sales_id
@@ -440,27 +435,7 @@
         and c.customer_create_time < #{endTime}
       </if>
       <if test="sendLogisticsNo != null and sendLogisticsNo != ''">
-        and c.customer_id in (
-        SELECT customer_id
-        FROM tb_rst_renewed trr
-        WHERE renewed_send_logistics_no = #{sendLogisticsNo} OR renewed_back_logistics_no = #{sendLogisticsNo}
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_repair
-        WHERE repair_send_logistics_no =#{sendLogisticsNo} OR repair_back_logistics_no = #{sendLogisticsNo}
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_reissue
-        WHERE reissue_send_logistics_no = #{sendLogisticsNo}
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_back_goods
-        WHERE back_goods_back_logistics_no = #{sendLogisticsNo}
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_noreason_back
-        WHERE noreason_back_back_logistics_no = #{sendLogisticsNo}
-        )
+        AND  cc.relationSendLogisticsNo =  #{sendLogisticsNo} OR cc.relationBackLogisticsNo  =  #{sendLogisticsNo}
       </if>
       <if test="backStatus != null and backStatus != ''">
         and c.customer_id in (

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -655,7 +655,7 @@
                 #{salesMainOrderId},
                 #{salesBatchId},
                 #{salesAddType},
-                now(),
+                #{salesCreateTime},
                 #{salesAdminId},
                 #{salesCustomerId}
             )
@@ -1259,4 +1259,114 @@
         AND sales_shipping_status = 1
     </update>
 
+
+    <select id="getDeliverNum" resultType="Integer" parameterType="SalesOrder" >
+        SELECT COUNT(t.sales_id)
+        FROM tb_rst_sales_order_info t
+        <where>
+            <if test="salesCreateTime !=null and salesCreateTime !=''">
+                AND date_format(t.sales_create_time,'%Y-%m-%d') =  date_format( #{salesCreateTime},'%Y-%m-%d')
+            </if>
+            <if test="salesShippingStatus !=null">
+                AND t.sales_shipping_status =  #{salesShippingStatus}
+            </if>
+            <if test="salesDeliver !=null">
+                AND t.sales_deliver = #{salesDeliver}
+            </if>
+        </where>
+    </select>
+
+
+    <resultMap id="SalesOrderAndItemMap" type="SalesOrder" >
+        <id column="sales_id" property="salesId" jdbcType="INTEGER" />
+        <collection property="salesOrderItemList" column="sales_id" javaType="ArrayList" select="selectSalesOrderItemList"/>
+    </resultMap>
+
+    <!-- 订单集合 -->
+    <select id="salesOrderListAndItem" resultMap="SalesOrderAndItemMap" parameterType="SalesOrder" >
+        select
+        tb_rst_sales_order_info.*
+        from tb_rst_sales_order_info
+        <where>
+            <if test="salesIsDownload !=null and salesIsDownload !=''">
+                AND sales_is_download = #{salesIsDownload}
+            </if>
+            <if test="salesShippingStatus !=null">
+                AND sales_shipping_status = #{salesShippingStatus}
+            </if>
+            <if test="salesStatus !=null">
+                AND sales_status = #{salesStatus}
+            </if>
+            <if test="salesOrderStatus !=null">
+                AND sales_order_status = #{salesOrderStatus}
+            </if>
+            <if test="salesDeliver !=null">
+                AND sales_deliver = #{salesDeliver}
+            </if>
+            <if test="salesStoreId !=null and salesStoreId !=''">
+                AND sales_store_id = #{salesStoreId}
+            </if>
+            <if test="salesPostFirm !=null and salesPostFirm !=''">
+                AND sales_post_firm = #{salesPostFirm}
+            </if>
+            <if test="salesCompanyId !=null and salesCompanyId !=''">
+                AND sales_company_id = #{salesCompanyId}
+            </if>
+            <if test="salesId !=null">
+                AND sales_id = #{salesId}
+            </if>
+            <if test="salesOrderId !=null and salesOrderId !=''">
+                AND sales_orderId = #{salesOrderId}
+            </if>
+            <if test="salesDealCode !=null and salesDealCode !=''">
+                AND sales_deal_code = #{salesDealCode}
+            </if>
+            <if test="salesAddressTel !=null and salesAddressTel !=''">
+                AND sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
+            </if>
+            <if test="salesAddressName !=null and salesAddressName !=''">
+                AND sales_address_name like CONCAT('%',#{salesAddressName},'%')
+            </if>
+            <if test="salesBatchId !=null and salesBatchId !=''">
+                AND sales_batch_id = #{salesBatchId}
+            </if>
+            <if test="salesAddressInfo !=null and salesAddressInfo !=''">
+                AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
+            </if>
+            <if test="itemProductName !=null and itemProductName !=''">
+                AND oi.item_product_color like CONCAT('%',#{itemProductName},'%')
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND sales_create_time <![CDATA[>=]]> #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND sales_create_time <![CDATA[<=]]> #{endDate}
+            </if>
+            <if test="salesAdminId != null ">
+                AND sales_admin_id = #{salesAdminId}
+            </if>
+            <if test="salesAddType != null ">
+                AND sales_add_type = #{salesAddType}
+            </if>
+            <if test="salesIds != null and salesIds != ''">
+                AND sales_id IN
+                <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
+                    #{node}
+                </foreach >
+            </if>
+        </where>
+        GROUP BY tb_rst_sales_order_info.sales_id
+        ORDER BY tb_rst_sales_order_info.sales_id DESC
+    </select>
+
+
+    <!-- 订单集合 -->
+    <select id="selectSalesOrderItemList" resultType="SalesOrderItem" parameterType="Integer" >
+        select
+          *
+        from tb_rst_sales_order_item
+        WHERE  item_order_id = #{salesId}
+    </select>
+
+
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/order/ProvincesLogisticsServiceImpl.java

@@ -0,0 +1,56 @@
+package com.iamberry.rst.service.order;
+
+import com.iamberry.rst.core.order.ProvincesLogistics;
+import com.iamberry.rst.faces.order.ProvincesLogisticsService;
+import com.iamberry.rst.service.order.mapper.ProvincesLogisticsMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  省指定快递公司信息表接口
+ * @author
+ * @Date 2018-10-31
+ */
+@Service
+public class ProvincesLogisticsServiceImpl  implements ProvincesLogisticsService {
+    @Autowired
+    private ProvincesLogisticsMapper provincesLogisticsMapper;
+    /**
+     * 获取集合
+     * @param  provincesLogistics
+     * @return List
+     */
+    @Override
+    public List<ProvincesLogistics> getProvincesLogisticsList(ProvincesLogistics  provincesLogistics){
+        return  provincesLogisticsMapper.getProvincesLogisticsList(provincesLogistics);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  provincesLogistics
+     */
+    @Override
+    public  ProvincesLogistics  getProvincesLogisticsById(Integer  id){
+        return  provincesLogisticsMapper.getProvincesLogisticsById(id);
+    }
+    /**
+     * 增加数据
+     * @param  provincesLogistics
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ProvincesLogistics  provincesLogistics){
+        return  provincesLogisticsMapper.save(provincesLogistics);
+    }
+    /**
+     * 修改数据
+     * @param  provincesLogistics
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ProvincesLogistics  provincesLogistics){
+        return  provincesLogisticsMapper.update(provincesLogistics);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/order/mapper/ProvincesLogisticsMapper.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.service.order.mapper;
+
+import com.iamberry.rst.core.order.ProvincesLogistics;
+
+import java.util.List;
+
+/**
+ *  省指定快递公司信息表接口
+ * @author
+ * @Date 2018-10-31
+ */
+public interface ProvincesLogisticsMapper {
+    /**
+     * 获取集合
+     * @param  provincesLogistics
+     * @return List
+     */
+    List<ProvincesLogistics> getProvincesLogisticsList(ProvincesLogistics  provincesLogistics);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  provincesLogistics
+     */
+    ProvincesLogistics  getProvincesLogisticsById(Integer  id);
+    /**
+     * 增加数据
+     * @param  provincesLogistics
+     * @return Integer
+     */
+    Integer  save(ProvincesLogistics  provincesLogistics);
+    /**
+     * 修改数据
+     * @param  provincesLogistics
+     * @return Integer
+     */
+    Integer  update(ProvincesLogistics  provincesLogistics);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/order/mapper/provincesLogisticsMapper.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iamberry.rst.service.order.mapper.ProvincesLogisticsMapper">
+    <resultMap  id="BaseResultMap" type="ProvincesLogistics" >
+        <result    column="provinces_logistics_id"    property="provincesLogisticsId" />
+        <result    column="province_id"    property="provinceId" />
+        <result    column="logistics_id"    property="logisticsId" />
+        <result    column="provinces_logistics_update_time"    property="provincesLogisticsUpdateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.provinces_logistics_id,
+        t.province_id,
+        t.logistics_id,
+        t.provinces_logistics_update_time
+    </sql>
+
+    <select id="getProvincesLogisticsList" resultType="ProvincesLogistics" parameterType="ProvincesLogistics" >
+        select
+            t.provinces_logistics_id,
+            t.province_id,
+            t.logistics_id,
+            t.provinces_logistics_update_time,
+            li.*,
+            ap.province
+        from tb_rst_order_provinces_logistics t
+        LEFT JOIN tb_rst_logistics_info li ON t.logistics_id = li.logistics_id
+        LEFT JOIN tb_rst_address_province ap ON t.province_id = ap.province_id
+        <where>
+            <if test="provincesLogisticsId != null ">
+                AND t.provinces_logistics_id = #{provincesLogisticsId}
+            </if >
+            <if test="provinceId != null ">
+                AND t.province_id = #{provinceId}
+            </if >
+            <if test="logisticsId != null ">
+                AND t.logistics_id = #{logisticsId}
+            </if >
+            <if test="province != null and province != ''">
+                AND ap.province LIKE CONCAT('%',#{province},'%')
+            </if >
+        </where>
+    </select>
+
+    <select id="getProvincesLogisticsById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_order_provinces_logistics t
+        where t.provinces_logistics_id= #{provincesLogisticsId}
+    </select>
+    <insert id="save" parameterType="ProvincesLogistics" >
+        insert into
+        tb_rst_order_provinces_logistics
+        (
+        province_id,
+        logistics_id
+        )
+        values
+        (
+        #{provinceId},
+        #{logisticsId}
+        )
+    </insert>
+    <update id="update" parameterType="ProvincesLogistics" >
+        update
+        tb_rst_order_provinces_logistics
+        <set >
+            <if test="provinceId != null ">
+                province_id = #{provinceId},
+            </if >
+            <if test="logisticsId != null ">
+                logistics_id = #{logisticsId},
+            </if >
+        </set >
+        where provinces_logistics_id= #{provincesLogisticsId}
+    </update>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/product/ProductServiceImpl.java

@@ -159,5 +159,10 @@ public class ProductServiceImpl implements ProductService {
         return productMapper.getFittingsBySku(colorBar);
     }
 
+    @Override
+    public ProductColor getColorByBar(String colorBar) {
+        return productMapper.getColorByBar(colorBar);
+    }
+
 
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/ProductMapper.java

@@ -98,4 +98,11 @@ public interface ProductMapper {
      * @return
      */
     ProductColor getProductBySku(String colorBar);
+
+    /**
+     * 根据sku查询颜色信息
+     * @return
+     */
+    ProductColor getColorByBar(String colorBar);
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/productMapper.xml

@@ -244,4 +244,15 @@
         color_bar = #{colorBar}
     </select>
 
+    <select id="getColorByBar" parameterType="String"  resultType="ProductColor">
+        SELECT
+            pc.*,
+            pi.product_type,
+            pi.product_name
+        FROM
+        tb_rst_product_color pc
+        LEFT JOIN tb_rst_product_info pi ON  pc.color_product_id = pi.product_id
+        WHERE pc.color_bar = #{colorBar}
+    </select>
+
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApplyPickController.java

@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 @Controller
 @RequestMapping("/wechat/applyPick")
@@ -238,6 +239,9 @@ public class ApplyPickController {
         if(applyPickShipCertificate == null || "".equals(applyPickShipCertificate) ){
             return new ResponseJson(500, "发货凭证为空!", 500);
         }
+        if(!Pattern.matches("^[0-9a-zA-Z]{1,50}", applyPickShipCertificate)){
+            return new ResponseJson(500, "发货凭证只能为数字和英文字母!", 500);
+        }
         ApprovalApplyPick aap =  applyPickService.getApprovalApplyPickById(applyPickId);
         if(aap == null){
             return new ResponseJson(500, "提货信息有误!", 500);
@@ -267,5 +271,4 @@ public class ApplyPickController {
         }
         return rj;
     }
-
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -269,7 +269,7 @@ public class AwaitSendController {
             }
             Goodsquantity += temp.getItemNum();
         }
-        String uuid = UUIDGenerator.getUUID().substring(0, 10);
+        String uuid = UUIDGenerator.getUUID().substring(0, 8);
         Map<String, Object> product1 = new HashMap<String, Object>();
         product1.put("GoodsName", uuid);
         product1.put("Goodsquantity", Goodsquantity);
@@ -486,5 +486,66 @@ public class AwaitSendController {
         return rj;
     }
 
+    /**
+     * 出库
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("salesOrder:deliver:deliverList")
+    @RequestMapping("/getDeliverNum")
+    public ResponseJson getDeliverNum(HttpServletRequest request,Integer type) {
+        ResponseJson rj = ResponseJson.getSUCCESS();
+
+        Calendar calendarStart = Calendar.getInstance();
+        calendarStart.set(Calendar.HOUR_OF_DAY,0);
+        calendarStart.set(Calendar.MINUTE,0);
+        calendarStart.set(Calendar.SECOND,0);
+
+        Calendar calendarEnd = Calendar.getInstance();
+        calendarEnd.set(Calendar.HOUR_OF_DAY,23);
+        calendarEnd.set(Calendar.MINUTE,59);
+        calendarEnd.set(Calendar.SECOND,59);
+
+        List<Map<String,Object>> list = new ArrayList<>();
+
+        SalesOrder salesOrder = new SalesOrder();
+        if(type == 1){
+            salesOrder.setStartDate(calendarStart.getTime());
+            salesOrder.setEndDate(calendarEnd.getTime());
+        }else{
+            //2：昨日
+            calendarStart.add(Calendar.DATE, -1);// 日期减1
+            calendarEnd.add(Calendar.DATE, -1);// 日期减1
+            salesOrder.setStartDate(calendarStart.getTime());
+            salesOrder.setEndDate(calendarEnd.getTime());
+        }
+
+//        salesOrderService.getDeliverNum(salesOrder);
+
+        //type: 1：今日
+        Map<String,Object> map = new HashMap<>();
+        Integer num = 0;
+
+        salesOrder.setSalesShippingStatus(11);
+        List<SalesOrder> salesOrderList = salesOrderService.salesOrderListAndItem(salesOrder);
+        for (SalesOrder so:salesOrderList) {
+            for (SalesOrderItem salesOrderItem : so.getSalesOrderItemList()) {
+                map.put("bar",salesOrderItem.getItemColorBar());
+                map.put("product",salesOrderItem.getItemProductName());
+                map.put("color",salesOrderItem.getItemProductColor());
+                Integer barNum = salesOrderItem.getItemNum();
+                for (Map<String,Object> m:list) {
+                    if(m.get("bar") != null && m.get("bar").equals(salesOrderItem.getItemColorBar())){
+                        barNum += (Integer)m.get("num");
+                    }
+                }
+                map.put("num",barNum);
+            }
+        }
+        list.add(map);
+
+        return rj;
+    }
 
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/wechat/TestController.java

@@ -10,11 +10,11 @@ import javax.servlet.http.HttpServletRequest;
 
 @Controller
 @RequestMapping("/wechat/getTest")
-public class TestController {
+public class WeChatTestController {
 
     @ResponseBody
-    @RequestMapping(value = "/test")
-    public ResponseJson test(HttpServletRequest request
+    @RequestMapping(value = "/wechatTest")
+    public ResponseJson wechatTest(HttpServletRequest request
             ) throws Exception {
 
         String openId = WechatUtils.getUserBySession(request).getUserOpenid();

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -33,6 +33,7 @@
 		<typeAlias type="com.iamberry.rst.core.order.OrderCheckLog" alias="OrderCheckLog"/>
 		<typeAlias type="com.iamberry.rst.core.order.OrderBatch" alias="OrderBatch"/>
 		<typeAlias type="com.iamberry.rst.core.order.PostInfo" alias="PostInfo"/>
+		<typeAlias type="com.iamberry.rst.core.order.ProvincesLogistics" alias="ProvincesLogistics"/>
 
 		<typeAlias type="com.iamberry.rst.core.sms.SmsMessage" alias="SmsMessage"/>
 		<typeAlias type="com.iamberry.rst.core.sms.OrderMessage" alias="OrderMessage"/>
@@ -236,6 +237,7 @@
 		<mapper resource="com/iamberry/rst/service/order/mapper/orderMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/order/mapper/orderBatchMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/order/mapper/logisticsInfoMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/order/mapper/provincesLogisticsMapper.xml"/>
 
 		<mapper resource="com/iamberry/rst/service/cm/mapper/inventoryLogMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/cm/mapper/inventoryMapper.xml"/>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -280,12 +280,8 @@
 
    $(function (){
         var ulc = initAddress($(".address_info"));
-
         var sc = initSalesChannel($(".sales_channel"));
-    })
-
-    /*初始化销售公司店铺*/
-//    var sc = $(".sales_channel").initSalesChannel();
+   })
 
 </script>
 

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_list.ftl

@@ -71,13 +71,15 @@
                 <div class="formControls col-6 col-sm-6"  id="msg" style="display: none; line-height: 31px;color:#f00">
                 </div>
             </div>
-            <#--<div class="row cl">-->
-                <#--<label class="form-label col-3">-->
-                    <#--<div class="tit-2">今日出库</div>-->
-                <#--</label>-->
-                <#--<div class="formControls col-9">-->
-                <#--</div>-->
-            <#--</div>-->
+
+          <#--  <div class="row cl">
+                <label class="form-label col-3">
+                    <div class="tit-2">今日出库</div>
+                </label>
+                <div class="formControls col-9">
+                </div>
+            </div>-->
+
         </form>
     </div>
 </article>
@@ -124,7 +126,11 @@
             }
         });
     });
+</script>
+
+<script>
 
 </script>
+
 </body>
 </html>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/download_order_store.ftl

@@ -32,8 +32,8 @@
                 </select>
 
                 <select class="my-select" name="salesShippingStatus" id="salesShippingStatus" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
-                    <option value ="11" >已通知配货</option>
-                    <option value ="1" selected>已发货</option>
+                    <option value ="11" >待打单</option>
+                    <option value ="1" selected>已打单</option>
                 </select>
 
                 <select class="my-select" name="salesDeliver" id="salesDeliver" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

@@ -22,7 +22,7 @@
             <select class="select" name="salesShippingStatus" id="salesShippingStatus" style="height: 31px;width: 150px">-->
                 <option value="">发货状态</option>
                 <#--<option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 0>selected="selected"</#if></#if> value="0">待发货</option>-->
-                <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 11>selected="selected"</#if></#if> value="11">已通知配货</option>
+                <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 11>selected="selected"</#if></#if> value="11">待打单</option>
                 <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 1>selected="selected"</#if></#if> value="1">已打单</option>
             </select>
 
@@ -123,7 +123,7 @@
                 </td>
                 <td>
                     <#if o.salesShippingStatus == 11>
-                        <span style="color: red;">通知配货</span>
+                        <span style="color: red;">待打单</span>
                     <#elseif o.salesShippingStatus == 1>
                         <p>已打单</p>
                         <p>(${(o.salesSendTime?string("MM-dd HH:mm:ss"))!"暂无发货时间"})</p>