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

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

@@ -81,8 +81,6 @@ public class SalesOrder implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date endDate;                   //结束时间
 
-
-
     private List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
 
     //添加订单项属性，用于导出订单
@@ -96,7 +94,6 @@ public class SalesOrder implements Serializable {
     private String ids;        //前台传过来的订单编号
 
     //Efast升级新增字段 2018-6-6
-    private String isHaveImport;//是否已导出过
     private String styleColor;//上传订单结果颜色
 
     private String salesBatchId;    //批次编号
@@ -113,14 +110,6 @@ public class SalesOrder implements Serializable {
         this.styleColor = styleColor;
     }
 
-    public String getIsHaveImport() {
-        return isHaveImport;
-    }
-
-    public void setIsHaveImport(String isHaveImport) {
-        this.isHaveImport = isHaveImport;
-    }
-
     public Integer getSalesShippingStatus() {
         return salesShippingStatus;
     }

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

@@ -210,6 +210,13 @@ public interface SalesOrderService {
     Integer getSalesOrderNum(SalesOrder salesOrder);
 
     /**
+     *根据订单id 删除订单项
+     * @param salesIds
+     * @return
+     */
+    Integer delSalesOrder(List<String> salesIds);
+
+    /**
      * 批量确认订单
      * @param salesOrder
      * @return

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

@@ -782,9 +782,29 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return salesOrderMapper.getSalesOrderNum(salesOrder);
     }
 
+
+    @Override
+    public Integer delSalesOrder(List<String> salesIds){
+        return salesOrderMapper.delSalesOrder(salesIds);
+    }
+
+    @Transactional
     @Override
     public Integer listConfirmSalesOrder(SalesOrder salesOrder) {
-        return salesOrderMapper.listConfirmSalesOrder(salesOrder);
+        Integer flag = salesOrderMapper.listConfirmSalesOrder(salesOrder);
+        if(flag < 1){
+            throw new RuntimeException("确认订单失败！");
+        }
+
+        List<String> ids = new ArrayList<>();
+        List<SalesOrder> salesOrderList = salesOrderMapper.listSalesOrder(salesOrder);
+        for (SalesOrder so:salesOrderList){
+//            ids.add(so.getSalesId());
+//            salesOrder
+//
+//            flag = salesOrderService.addRstOrderAndIteminfo(so);
+        }
+        return flag;
     }
 
 

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

@@ -163,6 +163,13 @@ public interface SalesOrderMapper {
     Integer delOrderItem(Integer salesId);
 
     /**
+     *根据订单id 删除订单项
+     * @param salesIds
+     * @return
+     */
+    Integer delSalesOrder(List<String> salesIds);
+
+    /**
      * 批量确认订单
      * @param salesOrder
      * @return

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

@@ -66,8 +66,8 @@
     LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
     LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
     <where>
-      <if test="isHaveImport !=null and isHaveImport !=''">
-        AND sales_is_download = #{isHaveImport}
+      <if test="salesIsDownload !=null and salesIsDownload !=''">
+        AND sales_is_download = #{salesIsDownload}
       </if>
       <if test="salesShippingStatus !=null">
         AND sales_shipping_status = #{salesShippingStatus}
@@ -151,13 +151,16 @@
     FROM
       tb_rst_sales_order_info o
     <where>
-      <if test="isHaveImport !=null and isHaveImport !=''">
-        AND sales_is_download = #{isHaveImport}
+      <if test="salesIsDownload !=null ">
+        AND sales_is_download = #{salesIsDownload}
       </if>
-      <if test="salesShippingStatus !=null and salesShippingStatus !=''">
+      <if test="salesStatus !=null">
+        AND sales_status = #{salesStatus}
+      </if>
+      <if test="salesShippingStatus !=null ">
         AND sales_shipping_status = #{salesShippingStatus}
       </if>
-      <if test="salesStoreId !=null and salesStoreId !=''">
+      <if test="salesStoreId !=null">
         AND sales_store_id = #{salesStoreId}
       </if>
       <if test="salesId !=null">
@@ -184,9 +187,6 @@
       <if test="endDate != null and endDate != ''">
         AND o.sales_create_time <![CDATA[<=]]> #{endDate}
       </if>
-      <if test="salesIsDownload != null and endDate != ''">
-        AND o.sales_is_download  = #{salesIsDownload}
-      </if>
     </where>
   </select>
 
@@ -206,8 +206,11 @@
       LEFT JOIN tb_rst_store_info trsi ON o.sales_store_id = trsi.store_id
       LEFT JOIN tb_rst_sales_order_item i ON o.sales_id = i.item_order_id
       <where>
-        <if test="isHaveImport !=null and isHaveImport !=''">
-          AND sales_is_download = #{isHaveImport}
+        <if test="salesIsDownload !=null ">
+          AND sales_is_download = #{salesIsDownload}
+        </if>
+        <if test="salesStatus !=null ">
+           AND sales_status = #{salesStatus}
         </if>
         <if test="salesShippingStatus !=null and salesShippingStatus !=''">
           AND sales_shipping_status = #{salesShippingStatus}
@@ -239,9 +242,6 @@
         <if test="endDate != null and endDate != ''">
           AND o.sales_create_time <![CDATA[<=]]> #{endDate}
         </if>
-        <if test="salesIsDownload != null and endDate != ''">
-          AND o.sales_is_download  = #{salesIsDownload}
-        </if>
       </where>
   </select>
 
@@ -753,6 +753,15 @@
     WHERE item_order_id = #{salesId}
   </delete>
 
+    <delete id="delSalesOrder" parameterType="List" >
+        delete
+        tb_rst_sales_order_info
+        where sales_id  in
+        <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach >
+    </delete>
+
     <!-- 批量确认订单 -->
     <update id="listConfirmSalesOrder" parameterType="SalesOrder" >
         update tb_rst_sales_order_info

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

@@ -34,7 +34,7 @@
 <!--  录入订单 -->
 
 <div class="page-container">
-    <div class="text-c">
+    <div class="text-c" id="form-download">
         <form action="${path}/admin/salesOrder/list_order_page" method="post">
                 <div style="position: relative;float: left;display: block;width: 110px;height: 36px;" id="addOrderDiv" >
                     <button type="button" style="top: 0px;" class="my-btn-search my-order" id="addOrderType" >录入订单</button>
@@ -42,10 +42,10 @@
                     <button type="button" style="top: 72px;display: none;" class="my-btn-search my-order" id="addOrderExcel" onclick="upFiles();">Excel导入</button>
                 </div>
 
-                <select class="my-select" name="isHaveImport" id="isHaveImport" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                <select class="my-select" name="salesIsDownload" id="salesIsDownload" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
                     <option value ="">导出状态</option>
-                    <option value ="2" <#if salesOrder.isHaveImport??><#if salesOrder.isHaveImport == "2" >selected="selected"</#if></#if>>已导出</option>
-                    <option value ="1" <#if salesOrder.isHaveImport??><#if salesOrder.isHaveImport == "1" >selected="selected"</#if></#if>>未导出</option>
+                    <option value ="2" <#if salesOrder.salesIsDownload??><#if salesOrder.salesIsDownload == 2 >selected="selected"</#if></#if>>已导出</option>
+                    <option value ="1" <#if salesOrder.salesIsDownload??><#if salesOrder.salesIsDownload == 1 >selected="selected"</#if></#if>>未导出</option>
                 </select>
 
                 <select class="my-select" name="salesShippingStatus" id="salesShippingStatus" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
@@ -61,7 +61,7 @@
                     <option value ="2" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 2 >selected="selected"</#if></#if>>挂起</option>
                 </select>
 
-                <select name="salesStoreId" id="salesStoreId" class="select" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;"">
+                <select name="salesStoreId" id="salesStoreId" class="my-select" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;"">
                     <option value="">店铺</option>
                     <#if listStoreInfo?? &&  (listStoreInfo?size > 0) >
                         <#list listStoreInfo as info>
@@ -378,7 +378,8 @@
 
         /*导出上传到efast的Excel*/
         $('#order_excel').click(function (e) {
-            var isHaveImport = $("#isHaveImport").val(); //是否导出
+            var salesIsDownload = $("#salesIsDownload").val(); //是否导出
+            var salesStatus = $("#salesStatus").val(); //
             var salesShippingStatus = $("#salesShippingStatus").val(); //是否已发货
             var salesStoreId = $("#salesStoreId").val(); //店铺
             var startDate = $("#startDate").val();
@@ -393,7 +394,8 @@
                 type:'POST',
                 url: '${path}/admin/salesOrder/sync_efast_order_num',
                 data:{
-                    "isHaveImport" : isHaveImport,
+                    "salesIsDownload" : salesIsDownload,
+                    "salesStatus" : salesStatus,
                     "salesShippingStatus" : salesShippingStatus,
                     "salesStoreId" : salesStoreId,
                     "startDate" : startDate,
@@ -403,7 +405,6 @@
                     "salesAddressName" : salesAddressName,
                     "salesAddressTel" : salesAddressTel,
                     "salesBatchId" : salesBatchId
-
                 },
                 dataType: 'json',
                 async: false,
@@ -412,7 +413,18 @@
                         layer.msg(res.resultMsg,{icon: 2,time:3000});
                         return false;
                     }else{
-                        window.location="${path}/admin/salesOrder/download_efast_order?isHaveImport="+isHaveImport+"&salesShippingStatus="+salesShippingStatus+"&salesStoreId="+salesStoreId+"&startDate="+startDate+"&endDate="+endDate+"&salesOrderId="+salesOrderId+"&salesDealCode="+salesDealCode+"&salesAddressName="+salesAddressName+"&salesAddressTel="+salesAddressTel+"&salesBatchId="+salesBatchId;
+                        window.location="${path}/admin/salesOrder/download_efast_order?"
+                                +"salesIsDownload="+salesIsDownload
+                                +"&salesStatus="+salesStatus
+                                +"&salesShippingStatus="+salesShippingStatus
+                                +"&salesStoreId="+salesStoreId
+                                +"&startDate="+startDate
+                                +"&endDate="+endDate
+                                +"&salesOrderId="+salesOrderId
+                                +"&salesDealCode="+salesDealCode
+                                +"&salesAddressName="+salesAddressName
+                                +"&salesAddressTel="+salesAddressTel
+                                +"&salesBatchId="+salesBatchId;
                     }
                 }
             });