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

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

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

@@ -0,0 +1,34 @@
+package com.iamberry.rst.core.order;
+
+import java.io.Serializable;
+
+public class StrategyColor implements Serializable {
+    private static final long serialVersionUID = -6028247699055262823L;
+    private Integer strategyColorId;
+    private Integer strategyId;
+    private Integer colorId;
+
+    public Integer getStrategyColorId() {
+        return strategyColorId;
+    }
+
+    public void setStrategyColorId(Integer strategyColorId) {
+        this.strategyColorId = strategyColorId;
+    }
+
+    public Integer getStrategyId() {
+        return strategyId;
+    }
+
+    public void setStrategyId(Integer strategyId) {
+        this.strategyId = strategyId;
+    }
+
+    public Integer getColorId() {
+        return colorId;
+    }
+
+    public void setColorId(Integer colorId) {
+        this.colorId = colorId;
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.iamberry.rst.core.order;
+
+import java.io.Serializable;
+
+public class StrategyProduct implements Serializable {
+    private static final long serialVersionUID = -2966745222986608411L;
+    private Integer strategyPorudctId;
+    private Integer strategyId;
+    private Integer productId;
+
+    public Integer getStrategyPorudctId() {
+        return strategyPorudctId;
+    }
+
+    public void setStrategyPorudctId(Integer strategyPorudctId) {
+        this.strategyPorudctId = strategyPorudctId;
+    }
+
+    public Integer getStrategyId() {
+        return strategyId;
+    }
+
+    public void setStrategyId(Integer strategyId) {
+        this.strategyId = strategyId;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.iamberry.rst.core.order;
+
+import java.io.Serializable;
+
+public class StrategyStore implements Serializable {
+    private static final long serialVersionUID = -4179235404196694695L;
+    private Integer strategyStoreId;
+    private Integer strategyId;
+    private Integer storeId;
+
+    public Integer getStrategyStoreId() {
+        return strategyStoreId;
+    }
+
+    public void setStrategyStoreId(Integer strategyStoreId) {
+        this.strategyStoreId = strategyStoreId;
+    }
+
+    public Integer getStrategyId() {
+        return strategyId;
+    }
+
+    public void setStrategyId(Integer strategyId) {
+        this.strategyId = strategyId;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+}

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

@@ -576,7 +576,7 @@ public interface SalesOrderService {
     /**
      *订单跟踪查询
      */
-    List<OrderTracking> listTracking(Integer trackingId);
+    List<OrderTracking> listTracking(String salesDealCode);
     /**
      *查询手动修改订单号状态的订单数据
      */
@@ -585,4 +585,16 @@ public interface SalesOrderService {
      *修改订单打单状态信息
      */
     Integer updateSalesOrderShippingStatus(SalesOrder salesOrder);
+  /**
+   *添加快递策略产品项
+   */
+  Integer addStrategyProduct(StrategyProduct strategyProduct);
+  /**
+   *添加快递策略颜色项
+   */
+  Integer addStrategyColor(StrategyColor strategyColor);
+  /**
+   *添加快递策略店铺项
+   */
+  Integer addStrategyStore(StrategyStore strategyStore);
 }

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

@@ -2021,6 +2021,21 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return salesOrderMapper.updateSalesOrderShippingStatus(salesOrder);
     }
 
+    @Override
+    public Integer addStrategyProduct(StrategyProduct strategyProduct) {
+        return salesOrderMapper.addStrategyProduct(strategyProduct);
+    }
+
+    @Override
+    public Integer addStrategyColor(StrategyColor strategyColor) {
+        return salesOrderMapper.addStrategyColor(strategyColor);
+    }
+
+    @Override
+    public Integer addStrategyStore(StrategyStore strategyStore) {
+        return salesOrderMapper.addStrategyStore(strategyStore);
+    }
+
     /***
      * 计算金额
      * @param salesOrder

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

@@ -519,4 +519,16 @@ public interface SalesOrderMapper {
      *修改订单打单状态信息
      */
     Integer updateSalesOrderShippingStatus(SalesOrder salesOrder);
+    /**
+     *添加快递策略产品项
+     */
+    Integer addStrategyProduct(StrategyProduct strategyProduct);
+    /**
+     *添加快递策略颜色项
+     */
+    Integer addStrategyColor(StrategyColor strategyColor);
+    /**
+     *添加快递策略店铺项
+     */
+    Integer addStrategyStore(StrategyStore strategyStore);
 }

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

@@ -2491,4 +2491,40 @@
         </set>
         where sales_orderId = #{salesOrderId}
     </update>
+    <!-- 添加快递策略产品项 -->
+    <insert id="addStrategyProduct" parameterType="StrategyProduct">
+      insert INTO tb_rst_order_strategy_product
+      (
+        strategy_id,
+        product_id
+      )
+      VALUES
+      (
+        #{strategyId},
+        #{ProductId})
+    </insert>
+    <!-- 添加快递策略颜色项 -->
+    <insert id="addStrategyColor" parameterType="StrategyColor">
+      insert INTO tb_rst_order_strategy_color
+      (
+        strategy_id,
+        color_id
+      )
+      VALUES
+      (
+        #{strategyId},
+        #{ColorId})
+    </insert>
+    <!-- 添加快递策略店铺项 -->
+    <insert id="addStrategyStore" parameterType="StrategyStore">
+      insert INTO tb_rst_order_strategy_store
+      (
+        strategy_id,
+        store_id
+      )
+      VALUES
+      (
+        #{strategyId},
+        #{storeId})
+    </insert>
 </mapper>