1:解决通过省去匹配物流公司的情况

2：地址查询再次更新

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

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);

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}
             )

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/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>