订单列表修改，展示用户备注与商家备注

小亚通接口修改，处理店铺备注，小亚通商家备注，买家备注
产品添加组合产品录入是否需要拆分

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

@@ -63,6 +63,8 @@ public class Product implements Serializable {
     private Integer productIsCombination;//是否组合产品 1.否。2是
     private List<ProductCombinatInfo> productCombinatList = new ArrayList<ProductCombinatInfo>();   //组合产品集合
 
+    private Integer productIsSplit; //录入是否需要拆分  1需要 2不需要
+
     public Integer getProductId() {
         return productId;
     }
@@ -221,4 +223,12 @@ public class Product implements Serializable {
     public void setProductCombinatList(List<ProductCombinatInfo> productCombinatList) {
         this.productCombinatList = productCombinatList;
     }
+
+    public Integer getProductIsSplit() {
+        return productIsSplit;
+    }
+
+    public void setProductIsSplit(Integer productIsSplit) {
+        this.productIsSplit = productIsSplit;
+    }
 }

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

@@ -915,18 +915,22 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
 
                         //备注
                         if(job.has("memo")){
-                            String orderMemo = "",buyerMemo="",sellerMemo="";
-                            if(memoObj.has("orderMemo")){
+                            String orderMemo = "",buyerMemo="",sellerMemo="",buyerMessage="";
+                            if(memoObj.has("orderMemo")){   //小亚通商家备注  -- 郜思琪
                                 orderMemo = memoObj.getString("orderMemo");
                             }
-                            if(memoObj.has("buyerMemo")){
+                            if(memoObj.has("sellerMemo")){  //天猫，淘宝，商家备注 -- 客服
+                                sellerMemo = memoObj.getString("sellerMemo");
+                            }
+                            if(memoObj.has("buyerMemo")){   //买家留言，配送时间  -- 用户
                                 buyerMemo = memoObj.getString("buyerMemo");
                             }
-                            if(memoObj.has("sellerMemo")){
-                                sellerMemo = memoObj.getString("sellerMemo");
+                            if(memoObj.has("buyerMessage")){    //买家填写留言  -- 用户
+                                buyerMessage = memoObj.getString("buyerMessage");
                             }
-                            salesOrder.setSalesUserRemark(sellerMemo+"-"+buyerMemo);//用户备注
-                            salesOrder.setSalesAdminRemark(orderMemo);//后台的备注--卖家备注
+
+                            salesOrder.setSalesUserRemark(buyerMessage);//用户备注
+                            salesOrder.setSalesAdminRemark(orderMemo+"-"+sellerMemo);//后台的备注--卖家备注
                         }
 
                         //邮费

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

@@ -323,7 +323,8 @@
         product_number,
         product_is_detection,
         product_wholesale,
-        product_is_combination
+        product_is_combination,
+        product_is_split
         )
         values
         (
@@ -337,7 +338,8 @@
         #{productNumber},
         #{productIsDetection},
         #{productWholesale},
-        #{productIsCombination}
+        #{productIsCombination},
+        #{productIsSplit}
         )
     </insert>
     <update id="update" parameterType="Product" >
@@ -369,7 +371,10 @@
                 product_wholesale = #{productWholesale},
             </if >
             <if test="productIsDetection != null ">
-                product_is_detection = #{productIsDetection}
+                product_is_detection = #{productIsDetection},
+            </if >
+            <if test="productIsSplit != null ">
+                product_is_split = #{productIsSplit}
             </if >
         </set >
         where product_id= #{productId}

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

@@ -4,12 +4,15 @@ import com.iamberry.rst.core.cm.CompanyInfo;
 import com.iamberry.rst.core.cm.StoreInfo;
 import com.iamberry.rst.faces.cm.CompanyInfoService;
 import com.iamberry.rst.faces.cm.StoreInfoService;
+import com.iamberry.rst.faces.order.OrderDepartService;
+import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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 javax.servlet.http.HttpServletRequest;
@@ -29,6 +32,8 @@ public class AdminSalesChannelController {
     private CompanyInfoService companyInfoService;
     @Autowired
     private StoreInfoService storeInfoService;
+    @Autowired
+    private OrderDepartService orderDepartService;
 
     /**
      * 获取店铺集合
@@ -39,7 +44,13 @@ public class AdminSalesChannelController {
      */
     @ResponseBody
     @RequestMapping(value = "/select_storeInfo")
-    public ResponseJson listStoreInfo(HttpServletRequest request, StoreInfo storeInfo) {
+    public ResponseJson listStoreInfo(HttpServletRequest request, StoreInfo storeInfo,
+                                      @RequestParam(value = "isMyStore", defaultValue = "2", required = false) Integer isMyStore) {
+        if(isMyStore == 1){
+            //判断用户只能查看自己所能查询的公司的订单
+            Integer[] storeIds = orderDepartService.getDepartStoreIds(AdminUtils.getLoginAdminId());
+            storeInfo.setStoreIds(storeIds);
+        }
         storeInfo.setStoreStatus(1);
         List<StoreInfo> storeInfoList = storeInfoService.listStore(storeInfo);
         ResponseJson rj = new ResponseJson(200, "查询成功", 200);

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

@@ -387,7 +387,7 @@
                 companyId : companyId,
                 isMyStore : 1
             },
-            url: "${path}/admin/customer/select_storeInfo",
+            url: "${path}/admin/salesChannel/select_storeInfo",
             success: function(data){
                 $("#salesStoreId").empty();    //清空下拉框
                 $("#salesStoreId").append("<option  value=''></option>");

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

@@ -250,7 +250,26 @@
                     <br>
                     ${order.salesPostNum!''}
                     </td>
-                    <td>${order.salesUserRemark!''}</td>
+                    <td>
+                        <#if order.salesUserRemark??>
+                            <p title="${order.salesUserRemark!''}">
+                                <#if order.salesUserRemark?length gt 9>
+                                    ${order.salesUserRemark?substring(0,8)}...
+                                <#else>
+                                    ${order.salesUserRemark!''}
+                                </#if>
+                            </p>
+                        </#if>
+                        <#if order.salesAdminRemark??>
+                            <p title="${order.salesAdminRemark!''}">
+                                <#if order.salesAdminRemark?length gt 9>
+                                    ${order.salesAdminRemark?substring(0,8)}...
+                                <#else>
+                                    ${order.salesAdminRemark!''}
+                                </#if>
+                            </p>
+                        </#if>
+                    </td>
                     <td style="text-align: left;">
                         <#if order.salesOrderItemList ??>
                             <#list order.salesOrderItemList as d>

watero-rst-web/src/main/webapp/WEB-INF/views/product/add_product.ftl

@@ -119,6 +119,8 @@
                            <label for="productIsDetection-2">不需要</label>
                        </div>
                    </div>
+
+
             </div>
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>是否组合产品：</label>
@@ -132,6 +134,18 @@
                         <label for="productIsCombination-2">是</label>
                     </div>
                 </div>
+
+                <label class="form-label col-1 col-sm-1 productIsSplit_class" style="display: none"><span class="c-red">*</span>录入是否拆分：</label>
+                <div class="formControls col-4 col-sm-4 productIsSplit_class" style="display: none">
+                    <div class="radio-box">
+                        <input type="radio" id="productIsSplit-1" name="productIsSplit" value="1" >
+                        <label for="productIsSplit-1">需要</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="productIsSplit-2" name="productIsSplit" value="2" checked>
+                        <label for="productIsSplit-2">不需要</label>
+                    </div>
+                </div>
             </div>
 
             <div class="row cl" id="product_color" style="display: none;">

watero-rst-web/src/main/webapp/WEB-INF/views/product/update_product.ftl

@@ -109,7 +109,7 @@
                 </div>-->
 
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>售后检测：</label>
-                <div class="formControls col-2 col-sm-2">
+                <div class="formControls col-2 col-sm-4">
                     <div class="radio-box">
                         <input type="radio" id="productIsDetection-1" name="productIsDetection" value="1" <#if product.productIsDetection ==1 >checked</#if>>
                         <label for="productIsDetection-1">需要</label>
@@ -122,8 +122,9 @@
             </div>
 
             <div class="row cl">
+
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>是否组合产品：</label>
-                <div class="formControls col-2 col-sm-2">
+                <div class="formControls col-2 col-sm-4">
                     <div class="radio-box">
                         <input type="radio" id="productIsCombination-1" name="productIsCombination" value="1" <#if product.productIsCombination ==1 >checked</#if>>
                         <label for="productIsCombination-1">否&nbsp;&nbsp;&nbsp;</label>
@@ -133,6 +134,18 @@
                         <label for="productIsCombination-2">是</label>
                     </div>
                 </div>
+
+                <label class="form-label col-1 col-sm-1 productIsSplit_class" <#if product.productIsCombination ==1 >style="display: none" </#if>><span class="c-red">*</span>录入是否拆分：</label>
+                <div class="formControls col-4 col-sm-4 productIsSplit_class" <#if product.productIsCombination ==1 >style="display: none" </#if>>
+                    <div class="radio-box">
+                        <input type="radio" id="productIsSplit-1" name="productIsSplit" value="1" <#if product.productIsSplit ==1 >checked</#if>>
+                        <label for="productIsSplit-1">需要</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="productIsSplit-2" name="productIsSplit" value="2" <#if product.productIsSplit ==2 >checked</#if>>
+                        <label for="productIsSplit-2">不需要</label>
+                    </div>
+                </div>
             </div>
 
             <div class="row cl" id="product_color" <#if product.productIsCombination ==1 >style="display: none;"</#if>>

watero-rst-web/src/main/webapp/common/js/product/product.js

@@ -572,8 +572,10 @@ $("input[name='productIsCombination']").change(function (){
     var combination = parseInt($("input[name='productIsCombination']:checked").val());
     if(combination === 1){
         $("#product_color").hide();
+        $(".productIsSplit_class").hide();
     }
     if(combination === 2){
         $("#product_color").show();
+        $(".productIsSplit_class").show();
     }
 })