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

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

@@ -84,6 +84,8 @@ public interface SalesOrderService {
      */
     void addSalesOrderList(JSONObject obj) throws Exception;
 
+    void parseOrder(SalesOrder oginerOrder, List<SalesOrder> listOrder);
+
     /**
      * 同步efast订单
      * @param obj
@@ -122,6 +124,13 @@ public interface SalesOrderService {
     List<SalesOrder> listOrderExcel(SalesOrder salesOrder);
 
     /**
+     * 查询需要导出的数量
+     * @param salesOrder
+     * @return
+     */
+    Integer listOrderExcelNum(SalesOrder salesOrder);
+
+    /**
      * 删除订单根据Efast订单号
      */
     Integer delOrder(String orderId);
@@ -162,4 +171,15 @@ public interface SalesOrderService {
      * 根据颜色sku/查询产品是否是水机
      */
     Integer getIsMachine(String colorBar);
+
+    boolean addRstOrderinfo(SalesOrder mainOrder,List<SalesOrder> listSalesOrder);
+
+    /**
+     *查询拥有该交易号的数量
+     * @param code
+     * @return
+     */
+    Integer getOrderBySalesDealCodeNum(String code);
+
+
 }

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

@@ -1311,38 +1311,38 @@ public class CustomerServiceImpl implements CustomerService {
         //查询客诉列表
         List<CustomerInfo> customerList = customerInfoMapper.listCustomer(customerInfo);
 
-        if (customerList != null && customerList.size() > 0) {
-            for (CustomerInfo customer : customerList) {
-
-                CustomerCommon customerCommon = new CustomerCommon();
-                customerCommon.setCustomerId(customer.getCustomerId());
-                List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
-                if(customerCommonList == null || customerCommonList.size() < 1){
-                    continue;
-                }
-                customerCommon = customerCommonList.get(0);
-                customer.setBackStatus(customerCommon.getRelationBackStatus());
-                customer.setSendStatus(customerCommon.getRelationSendStatus());
-                customer.setSendLogisticsNo(customerCommon.getRelationSendLogisticsNo());
-                customer.setSendLogisticsCompany(customerCommon.getRelationSendLogisticsCompany());
-                customer.setBackLogisticsNo(customerCommon.getRelationBackLogisticsNo());
-                customer.setBackLogisticsCompany(customerCommon.getRelationBackLogisticsCompany());
-                Date date = null;
-                List<SalesOrder> salesOrderList = customerCommon.getSalesOrderList();
-                if(salesOrderList != null && salesOrderList.size() > 0){
-                    for (int k = 0;k<salesOrderList.size();k++){
-                        SalesOrder so = salesOrderList.get(k);
-                        List<SalesOrderItem> salesOrderItemList = so.getSalesOrderItemList();
-                        for (SalesOrderItem soi:salesOrderItemList) {
-                            if(1 == soi.getItemIsSource()){
-                                date = so.getSalesPayTime();
-                            }
-                        }
-                    }
-                }
-                customer.setSalesTime(date);
-            }
-        }
+//        if (customerList != null && customerList.size() > 0) {
+//            for (CustomerInfo customer : customerList) {
+//
+//                CustomerCommon customerCommon = new CustomerCommon();
+//                customerCommon.setCustomerId(customer.getCustomerId());
+//                List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
+//                if(customerCommonList == null || customerCommonList.size() < 1){
+//                    continue;
+//                }
+//                customerCommon = customerCommonList.get(0);
+//                customer.setBackStatus(customerCommon.getRelationBackStatus());
+//                customer.setSendStatus(customerCommon.getRelationSendStatus());
+//                customer.setSendLogisticsNo(customerCommon.getRelationSendLogisticsNo());
+//                customer.setSendLogisticsCompany(customerCommon.getRelationSendLogisticsCompany());
+//                customer.setBackLogisticsNo(customerCommon.getRelationBackLogisticsNo());
+//                customer.setBackLogisticsCompany(customerCommon.getRelationBackLogisticsCompany());
+//                Date date = null;
+//                List<SalesOrder> salesOrderList = customerCommon.getSalesOrderList();
+//                if(salesOrderList != null && salesOrderList.size() > 0){
+//                    for (int k = 0;k<salesOrderList.size();k++){
+//                        SalesOrder so = salesOrderList.get(k);
+//                        List<SalesOrderItem> salesOrderItemList = so.getSalesOrderItemList();
+//                        for (SalesOrderItem soi:salesOrderItemList) {
+//                            if(1 == soi.getItemIsSource()){
+//                                date = so.getSalesPayTime();
+//                            }
+//                        }
+//                    }
+//                }
+//                customer.setSalesTime(date);
+//            }
+//        }
         return PageUtil.getPage(customerList);
     }
 

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

@@ -21,10 +21,7 @@ import com.iamberry.rst.service.sys.mapper.SysConfigMapper;
 import com.iamberry.rst.util.PageUtil;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import net.sf.json.JSONArray;
-import net.sf.json.JSONNull;
 import net.sf.json.JSONObject;
-import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -32,13 +29,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.xml.crypto.Data;
 import java.beans.Transient;
-import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
-import static sun.misc.MessageUtils.where;
-
 /**
  * Created by liuzhiwei on 2017/10/31.
  */
@@ -216,7 +209,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                         }
                     }
                 }
-                parseOrder(oginerOrder, listOrder);
+                salesOrderService.parseOrder(oginerOrder, listOrder);
                 break;
             } else {
                 // 不满足, 继续下一个规则
@@ -229,7 +222,6 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             }
             ruleCount++;
         }
-
     }
 
 
@@ -264,7 +256,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         //匹配拆单规则 分割订单-------------state
         List<SalesOrder> listSalesOrder = new ArrayList<>();
         salesOrder.setSalesOrderItemList(list);
-        parseOrder(salesOrder, listSalesOrder);
+        salesOrderService.parseOrder(salesOrder, listSalesOrder);
         //匹配拆单规则 分割订单-------------end
         boolean msg = false;
         //判断主从订单--------------------state
@@ -288,14 +280,19 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             }
 
             //判断主从订单--------------------end
-             msg = addRstOrderinfo(mainOrder,listSalesOrder);
+             msg = salesOrderService.addRstOrderinfo(mainOrder,listSalesOrder);
         }
         return msg;
     }
 
-
+    @Override
     @Transactional
-    private boolean addRstOrderinfo(SalesOrder mainOrder,List<SalesOrder> listSalesOrder) {
+    public boolean addRstOrderinfo(SalesOrder mainOrder,List<SalesOrder> listSalesOrder) {
+        Integer flag = salesOrderMapper.getOrderBySalesDealCodeNum(mainOrder.getSalesDealCode());
+        if(flag > 0){
+            throw  new RuntimeException("交易号("+ mainOrder.getSalesDealCode() +")重复，请重新生成交易号！");
+        }
+
         int orderNum = salesOrderMapper.addSalesOrder(mainOrder);
         if (orderNum <= 0) {
             throw  new RuntimeException("添加订单出错--------！");
@@ -694,6 +691,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
     @Override
+    public Integer listOrderExcelNum(SalesOrder salesOrder) {
+        return salesOrderMapper.listOrderExcelNum(salesOrder);
+    }
+
+    @Override
     public Integer delOrder(String orderId) {
         return salesOrderMapper.delOrder(orderId);
     }
@@ -732,4 +734,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     public Integer getIsMachine(String colorBar) {
         return salesOrderMapper.getIsMachine(colorBar);
     }
+
+    @Override
+    public Integer getOrderBySalesDealCodeNum(String code) {
+        return salesOrderMapper.getOrderBySalesDealCodeNum(code);
+    }
+
+
 }

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

@@ -87,6 +87,13 @@ public interface SalesOrderMapper {
     List<SalesOrder> listOrderExcel(SalesOrder salesOrder);
 
     /**
+     * 查询需要导出的数量
+     * @param salesOrder
+     * @return
+     */
+    Integer listOrderExcelNum(SalesOrder salesOrder);
+
+    /**
      * 删除订单根据Efast订单号
      */
     Integer delOrder(String orderId);
@@ -119,4 +126,11 @@ public interface SalesOrderMapper {
      * 根据颜色sku/查询产品是否是水机
      */
     Integer getIsMachine(String colorBar);
+
+    /**
+     *查询拥有该交易号的数量
+     * @param code
+     * @return
+     */
+    Integer getOrderBySalesDealCodeNum(String code);
 }

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

@@ -87,6 +87,9 @@
       <if test="salesOrderId !=null and salesOrderId !=''">
         AND sales_orderId like CONCAT('%',#{salesOrderId},'%')
       </if>
+      <if test="salesDealCode !=null and salesDealCode !=''">
+        AND sales_deal_code like CONCAT('%',#{salesDealCode},'%')
+      </if>
       <if test="salesAddressTel !=null and salesAddressTel !=''">
         AND sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
       </if>
@@ -136,6 +139,49 @@
   </select>
 
   <!-- 查询需要导出的订单信息 -->
+  <select id="listOrderExcelNum" parameterType="SalesOrder" resultType="Integer">
+    SELECT
+      COUNT(o.sales_id)
+    FROM
+      tb_rst_sales_order_info o
+    <where>
+      <if test="isHaveImport !=null and isHaveImport !=''">
+        AND sales_is_download = #{isHaveImport}
+      </if>
+      <if test="isDeliverGoods !=null and isDeliverGoods !=''">
+        AND sales_shipping_status = #{isDeliverGoods}
+      </if>
+      <if test="salesStoreId !=null and salesStoreId !=''">
+        AND sales_store_id = #{salesStoreId}
+      </if>
+      <if test="salesId !=null">
+        o.sales_id like CONCAT('%',#{salesId},'%')
+      </if>
+      <if test="salesOrderId !=null and salesOrderId !=''">
+        AND o.sales_orderId like CONCAT('%',#{salesOrderId},'%')
+      </if>
+      <if test="salesDealCode !=null and salesDealCode !=''">
+        AND o.sales_deal_code like CONCAT('%',#{salesDealCode},'%')
+      </if>
+      <if test="salesAddressTel !=null and salesAddressTel !=''">
+        AND o.sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
+      </if>
+      <if test="salesAddressName !=null and salesAddressName !=''">
+        AND o.sales_address_name like CONCAT('%',#{salesAddressName},'%')
+      </if>
+      <if test="startDate != null and startDate != ''">
+        AND o.sales_create_time <![CDATA[>=]]> #{startDate}
+      </if>
+      <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>
+
+  <!-- 查询需要导出的订单信息 -->
   <select id="listOrderExcel" parameterType="SalesOrder" resultType="SalesOrder">
       SELECT
         o.*,
@@ -157,8 +203,8 @@
         <if test="isDeliverGoods !=null and isDeliverGoods !=''">
           AND sales_shipping_status = #{isDeliverGoods}
         </if>
-        <if test="storeName !=null and storeName !=''">
-          AND sales_store_id = #{storeName}
+        <if test="salesStoreId !=null and salesStoreId !=''">
+          AND sales_store_id = #{salesStoreId}
         </if>
         <if test="salesId !=null">
           o.sales_id like CONCAT('%',#{salesId},'%')
@@ -166,6 +212,9 @@
         <if test="salesOrderId !=null and salesOrderId !=''">
           AND o.sales_orderId like CONCAT('%',#{salesOrderId},'%')
         </if>
+        <if test="salesDealCode !=null and salesDealCode !=''">
+          AND o.sales_deal_code like CONCAT('%',#{salesDealCode},'%')
+        </if>
         <if test="salesAddressTel !=null and salesAddressTel !=''">
           AND o.sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
         </if>
@@ -544,4 +593,9 @@
         SELECT  IFNULL(MAX(color_is_machine),0) from tb_rst_product_color where color_bar = #{colorBar}
   </select>
 
+  <!-- 查询拥有该交易号的数量 -->
+  <select id="getOrderBySalesDealCodeNum" parameterType="String" resultType="Integer">
+    SELECT COUNT(sales_id) FROM tb_rst_sales_order_info WHERE sales_deal_code = #{code}
+  </select>
+
 </mapper>

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

@@ -794,7 +794,7 @@
         ON
         a.sales_id = b.item_order_id
         WHERE
-        a.sales_deal_code = #{orderDealCode}
+        a.sales_deal_code like CONCAT('%',#{orderDealCode},'%')
     </select>
     <!--querySalesOrderItemListBySalesId 查询订单项-->
     <select id="querySalesOrderItemListBySalesId" parameterType="java.lang.Integer" resultMap="salesOrderResult">

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -232,6 +232,7 @@ public class AdminCustomerController {
                     closedProdcue.setClosedProductName(sendProdcue.getSendProduceName());
                     closedProdcue.setClosedColorName(sendProdcue.getSendColorName());
                     closedProdcue.setClosedProdcueNumber(sendProdcue.getSendProdcueNumber());
+                    closedProdcue.setColorBar(sendProdcue.getColorBar());
                     closedProdcues.add(closedProdcue);
                 }
                 //售后寄回产品配件表
@@ -245,6 +246,7 @@ public class AdminCustomerController {
                     closedFitting.setClosedProductName(sendFitting.getSendProductName());
                     closedFitting.setClosedFittingsName(sendFitting.getSendFittingsName());
                     closedFitting.setClosedFittingNumber(sendFitting.getSendFittingNumber());
+                    closedFitting.setColorBar(sendFitting.getColorBar());
                     closedFittings.add(closedFitting);
                 }
                 customerCommon.setClosedProdcues(closedProdcues);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSalesOrderController.java

@@ -17,6 +17,8 @@ import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+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;
@@ -45,6 +47,8 @@ import static com.iamberry.rst.util.SmsConfig.SEND_NOTICE;
 @RequestMapping("admin/salesOrder")
 public class AdminSalesOrderController {
 
+    private Logger logger = LoggerFactory.getLogger(AdminSalesOrderController.class);
+
     @Autowired
     private SalesOrderService salesOrderService;
     @Autowired
@@ -82,7 +86,7 @@ public class AdminSalesOrderController {
                                         @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
         ModelAndView mv = new ModelAndView("cm/salesOrder/sales_order_list");
         //分页获取订单信息
-        PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(pageNO, pageSize, salesOrder, totalNum == 0);
+        PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
         }
@@ -392,6 +396,26 @@ public class AdminSalesOrderController {
 
 
     /**
+     * 获取导出数量
+     *
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequiresPermissions("salesOrder:excel:salesOrder")
+    @RequestMapping("/sync_efast_order_num")
+    public ResponseJson syncEfastOrderNum(HttpServletRequest request,SalesOrder salesOrder) throws Exception {
+        Integer orderSize = salesOrderService.listOrderExcelNum(salesOrder);
+        if(orderSize > 500){
+            logger.info("导出数量超过500");
+            return new ResponseJson(500, "导出数量超过500!", 500);
+        }else{
+            return new ResponseJson(200, "可以导出!", 200);
+        }
+    }
+
+
+    /**
      * 下载efast订单 (2018-05-25)
      * @param request
      * @param res
@@ -402,6 +426,12 @@ public class AdminSalesOrderController {
     @RequestMapping("/download_efast_order")
     public void downloadEfastOrderExcel(HttpServletRequest request,HttpServletResponse res,
                                 SalesOrder salesOrder) throws Exception{
+
+        Integer orderSize = salesOrderService.listOrderExcelNum(salesOrder);
+        if(orderSize > 500){
+            logger.info("导出数量超过500");
+            return;
+        }
         //根据id查询订单数据
         List<SalesOrder> orderList = salesOrderService.listOrderExcel(salesOrder);
             String[] cells = {
@@ -519,11 +549,11 @@ public class AdminSalesOrderController {
     @RequestMapping("/uploadLogisticsExcel")
     @ResponseBody
     public String uploadLogisticsExcel(HttpServletResponse response,HttpServletRequest request,@RequestParam("file") String file)throws IOException  {
-        Integer maxNumber = 100;
+        Integer maxNumber = 1000;
         String path = request.getServletContext().getRealPath(file);
         boolean flag = ExcelUtil.readExcelNumber(path,maxNumber);
         if(!flag){
-            return "最大上传数量为一百条，请检查文档内的数据是否符合条件！";
+            return "最大上传数量为1000条，请检查文档内的数据是否符合条件！";
         }
         List<String> listString  = ExcelUtil.readExcelHead(path);
         if(listString == null){

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

@@ -664,7 +664,7 @@ public class AdminOrderController {
             }*/
             //List<SalesOrder> temporarySalesOrderList = new ArrayList<SalesOrder>();
             //添加子订单
-            if(salesOrderList != null && salesOrderList.size() > 0) {
+            /*if(salesOrderList != null && salesOrderList.size() > 0) {
                 for (SalesOrder salesOrder : salesOrderList) {
                     int salesId = salesOrder.getSalesId();
                     List<SalesOrder> salesMainOrderList = orderService.querySalesOrderItemListBySalesId(salesId);//查询子订单
@@ -674,7 +674,7 @@ public class AdminOrderController {
                         }
                     }
                 }
-            }
+            }*/
             //添加主订单
             if(salesOrderList != null && salesOrderList.size() > 0) {
                 for (SalesOrder salesOrder : salesOrderList) {
@@ -1127,22 +1127,32 @@ public class AdminOrderController {
         StringBuffer sb = new StringBuffer();
          for(SalesOrder salesOrders: mapsalesOrderList.values()){
                 //orderService.updateSalesOrderPostType(salesOrders,postType);
-                bl = salesOrderService.addRstOrderAndIteminfo(salesOrders);
-                logger.info("EFAST升级合并订单项调用boolean值+："+bl);
-               String salesDealCode = salesOrders.getSalesDealCode();
-               if(bl == false){
-                   for(EfastOrder efastOrderStyle:orderEfasts){
-                       if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
-                       efastOrderStyle.setStyleColor("color:red;");
-                   }
-                   newFaultNum ++;
-               }else{
-                   for(EfastOrder efastOrderStyle:orderEfasts){
-                       if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
-                           efastOrderStyle.setStyleColor("color:black;");
-                   }
-                   sb.append(salesOrders.getSalesDealCode()+"\r\n");
-               }
+                String salesDealCode = salesOrders.getSalesDealCode();
+
+                try{
+                    bl = salesOrderService.addRstOrderAndIteminfo(salesOrders);
+                    if(bl == false){
+                        logger.info("合并订单出错+："+bl + "错误交易号为："+salesDealCode);
+                        for(EfastOrder efastOrderStyle:orderEfasts){
+                            if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
+                                efastOrderStyle.setStyleColor("color:red;");
+                        }
+                        newFaultNum ++;
+                    }else{
+                        for(EfastOrder efastOrderStyle:orderEfasts){
+                            if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
+                                efastOrderStyle.setStyleColor("color:black;");
+                        }
+                        sb.append(salesDealCode+"\r\n");
+                    }
+                }catch (RuntimeException e){
+                    logger.info("插入订单失败；错误信息" + e.getMessage());
+                    for(EfastOrder efastOrderStyle:orderEfasts){
+                        if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
+                            efastOrderStyle.setStyleColor("color:red;");
+                    }
+                    newFaultNum ++;
+                }
          }
         /*if(!bl){
             return ResponseJson.SUCCESS;
@@ -1174,14 +1184,7 @@ public class AdminOrderController {
         }else{
             fileName = "";
         }
-
         logger.info("-------- 推送订单到Efast开始 - Efast个数："+ orderEfasts.size() +"--------");
-        // 推送
-        /*try {
-            efastOrderService.sendOrderInfoToEfast(orderEfasts, null);
-        } catch (Exception e) {
-            logger.error("", e);
-        }*/
         logger.info("-------- 推送订单到Efast结束 ---------");
         return new ResponseJson(200, "SUCCESS", 200)
                 .addResponseKeyValue("errorPath", request.getContextPath() + filePath)

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -454,7 +454,7 @@ public class ExcelUtil {
                 //String userTel = getValue(temp.getCell(telColumnIndex)).trim();   // 读取tel
                 Cell telCell = temp.getCell(telColumnIndex);
                 String userTel = String.valueOf(getExcelCell(telCell));
-                String OrderProductBarCodeValue = map.get(getValue(temp.getCell(productColumnIndex)).trim()); // 读取对应的产品id
+                String OrderProductBarCodeValue = map.get(getValue(temp.getCell(productColumnIndex))); // 读取对应的产品id
                 if(StringUtils.isEmpty(nameValue) && StringUtils.isEmpty(userTel) && StringUtils.isEmpty(OrderProductBarCodeValue)){
                     errorNum ++;
                     if(errorNum > 3){

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

@@ -26,7 +26,7 @@
     <aop:aspectj-autoproxy proxy-target-class="true"/>
 
 	<!-- 开启注解启动定时器 -->
-    <task:annotation-driven/>
+    <!--<task:annotation-driven/>-->
 
 	<!-- DataSource -->
 	<import resource="classpath:watero-rst-db.xml"/>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

@@ -178,7 +178,10 @@
                                 <#elseif customer.customerSourceType == 3>
 
                                 </#if>
-                                 - ${customer.customerSource!''}
+                                <#if customer.customerSource??>
+                                    -${customer.customerSource }
+                                </#if>
+
                             </td>
                             <td>${customer.typeName!''}</td>
                             <#--<td>${customer.complaintClassName!''}</td>-->
@@ -226,20 +229,26 @@
                                 <#elseif customer.customerIsSolve == 3>
                                     换新(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateRenewed(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if>,
-                                        <#if customer.sendStatus == 1>
-                                            未寄送
-                                        <#elseif customer.sendStatus == 2>
-                                            已寄送
-                                        <#elseif customer.sendStatus == 3>
-                                            已收货
-                                        </#if><#--,
+                                        <font color=#06c>
+                                            <#if customer.backStatus??>
+                                                <#if customer.backStatus == 1>
+                                                    未寄回
+                                                <#elseif customer.backStatus == 2>
+                                                    已寄回
+                                                <#elseif customer.backStatus == 3>
+                                                    已收货
+                                                </#if>,
+                                            </#if>
+                                            <#if customer.sendStatus??>
+                                                <#if customer.sendStatus == 1>
+                                                    未寄送
+                                                <#elseif customer.sendStatus == 2>
+                                                    已寄送
+                                                <#elseif customer.sendStatus == 3>
+                                                    已收货
+                                                </#if>
+                                            </#if>
+                                        <#--,
                                         <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
                                             <#list customer.complaintDetectList as complaintDetect>
                                                 <#if (complaintDetect_index = 0)>
@@ -261,20 +270,27 @@
                                 <#elseif customer.customerIsSolve == 4>
                                     维修(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateRepair(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if>,
-                                        <#if customer.sendStatus == 1>
-                                            未寄送
-                                        <#elseif customer.sendStatus == 2>
-                                            已寄送
-                                        <#elseif customer.sendStatus == 3>
-                                            已收货
-                                        </#if><#--,
+                                        <font color=#06c>
+                                            <#if customer.backStatus??>
+                                                <#if customer.backStatus == 1>
+                                                    未寄回
+                                                <#elseif customer.backStatus == 2>
+                                                    已寄回
+                                                <#elseif customer.backStatus == 3>
+                                                    已收货
+                                                </#if>,
+                                            </#if>
+                                            <#if customer.sendStatus??>
+                                                <#if customer.sendStatus == 1>
+                                                    未寄送
+                                                <#elseif customer.sendStatus == 2>
+                                                    已寄送
+                                                <#elseif customer.sendStatus == 3>
+                                                    已收货
+                                                </#if>
+                                            </#if>
+
+                                        <#--,
                                             <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
                                                 <#list customer.complaintDetectList as complaintDetect>
                                                     <#if (complaintDetect_index = 0)>
@@ -295,37 +311,49 @@
                                 <#elseif customer.customerIsSolve == 5>
                                     补发(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateReissue(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.sendStatus == 1>
-                                            未寄送
-                                        <#elseif customer.sendStatus == 2>
-                                            已寄送
-                                        <#elseif customer.sendStatus == 3>
-                                            已收货
-                                        </#if></font>
+                                        <font color=#06c>
+                                            <#if customer.sendStatus??>
+                                                <#if customer.sendStatus == 1>
+                                                    未寄送
+                                                <#elseif customer.sendStatus == 2>
+                                                    已寄送
+                                                <#elseif customer.sendStatus == 3>
+                                                    已收货
+                                                </#if>
+                                            </#if>
+                                        </font>
                                     </a>
                                     )
                                 <#elseif customer.customerIsSolve == 6>
                                     退货(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateBookGoods(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if></font>
+                                        <font color=#06c>
+                                            <#if customer.backStatus??>
+                                                <#if customer.backStatus == 1>
+                                                    未寄回
+                                                <#elseif customer.backStatus == 2>
+                                                    已寄回
+                                                <#elseif customer.backStatus == 3>
+                                                    已收货
+                                                </#if>
+                                            </#if>
+                                        </font>
                                     </a>
                                     )
                                 <#elseif customer.customerIsSolve == 7>
                                     无理由退货(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateNoreasonBack(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if></font>
+                                        <font color=#06c>
+                                            <#if customer.backStatus??>
+                                                <#if customer.backStatus == 1>
+                                                    未寄回
+                                                <#elseif customer.backStatus == 2>
+                                                    已寄回
+                                                <#elseif customer.backStatus == 3>
+                                                    已收货
+                                                </#if>
+                                            </#if>
+                                        </font>
                                     </a>
                                     )
                                 </#if>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

@@ -385,11 +385,15 @@
                         }
                         <#--1：正常 2：换货 3：退货  4:维修  5：补发-->
 
+                        var disHtml =  "";
+                        if(salesOrder.salesOrderId == null || salesOrder.salesOrderId == "" || typeof (salesOrder.salesOrderId) == 'undefined'){
+                            disHtml = 'disabled="disabled"';
+                        }
                         html += '<tr class="text-c">' +
-                                ' <td><input type="checkbox" class="sales_order_id" id="" value="'+ salesOrder.salesId +'" ></td>' +
+                                ' <td><input type="checkbox" class="sales_order_id" id="" value="'+ salesOrder.salesId +'" '+ disHtml +'></td>' +
                                 ' <td>'+ convertUndefinedToEmpty(salesOrder.companyName) +'</td>' +
                                 ' <td>'+ convertUndefinedToEmpty(salesOrder.storeName) +'</td>' +
-                                ' <td>'+ salesOrder.salesOrderId +'</td>' +
+                                ' <td>'+ convertUndefinedToEmpty(salesOrder.salesOrderId) +'</td>' +
                                 ' <td>'+ salesOrder.salesDealCode +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressName +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressTel +'</td>' +

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

@@ -57,28 +57,16 @@
 <div class="page-container">
     <div class="text-c">
         <form action="${path}/admin/salesOrder/list_order_page" method="post">
-            <#--Efast add begin-->
-                <#--<select class="my-select" name="customerIsVisit" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
-                    <option value ="">是否需要回访</option>
-                    <option value="">是否回访</option>
-                    <option value ="1" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "1" >selected="selected"</#if></#if>>不需要回访</option>
-                    <option value ="2" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "2" >selected="selected"</#if></#if>>需要回访</option>
-                </select>-->
                 <select class="my-select" name="isHaveImport" id="isHaveImport" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
                     <option value ="">是否已导出过</option>
-                    <#--<option value ="1">是</option>
-                    <option value ="2">否</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>
                 </select>
                 <select class="my-select" name="isDeliverGoods" id="isDeliverGoods" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
                     <option value ="">是否已发货</option>
-                    <#--<option value ="1">是</option>
-                    <option value ="2">否</option>-->
                     <option value ="1" <#if salesOrder.isDeliverGoods??><#if salesOrder.isDeliverGoods == "1" >selected="selected"</#if></#if>>是</option>
                     <option value ="0" <#if salesOrder.isDeliverGoods??><#if salesOrder.isDeliverGoods == "0" >selected="selected"</#if></#if>>否</option>
                 </select>
-                <#--<input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.storeName!}" placeholder="店铺" name="storeName" id="storeName">-->
                 <select name="salesStoreId" id="salesStoreId" class="select" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;"">
                 <option value="">店铺</option>
                     <#if listStoreInfo?? &&  (listStoreInfo?size > 0) >
@@ -86,44 +74,10 @@
                             <option value="${info.storeId!''}" <#if salesOrder.salesStoreId??><#if salesOrder.salesStoreId == info.storeId >selected="selected"</#if></#if>>${info.storeName!''}</option>
                         </#list>
                     </#if>
-                    <#--<option value="4" <#if salesOrder.storeName??><#if salesOrder.storeName == "004" >selected="selected"</#if></#if>>微商/代理商</option>
-                    <option value="11" <#if salesOrder.storeName??><#if salesOrder.storeName == "004001" >selected="selected"</#if></#if>>微信平台商</option>
-                    <option value="13" <#if salesOrder.storeName??><#if salesOrder.storeName == "13" >selected="selected"</#if></#if>>上海零售</option>
-                    <option value="15" <#if salesOrder.storeName??><#if salesOrder.storeName == "15" >selected="selected"</#if></#if>>小小包 </option>
-                    <option value="16" <#if salesOrder.storeName??><#if salesOrder.storeName == "16" >selected="selected"</#if></#if>>伊姐团购</option>
-                    <option value="17" <#if salesOrder.storeName??><#if salesOrder.storeName == "17" >selected="selected"</#if></#if>>物道团购</option>
-                    <option value="18" <#if salesOrder.storeName??><#if salesOrder.storeName == "18" >selected="selected"</#if></#if>>年糕妈妈</option>
-                    <option value="19" <#if salesOrder.storeName??><#if salesOrder.storeName == "19" >selected="selected"</#if></#if>>快抱团</option>
-                    <option value="20" <#if salesOrder.storeName??><#if salesOrder.storeName == "20" >selected="selected"</#if></#if>>北京北斗</option>
-                    <option value="21" <#if salesOrder.storeName??><#if salesOrder.storeName == "21" >selected="selected"</#if></#if>>凯叔</option>
-                    <option value="22" <#if salesOrder.storeName??><#if salesOrder.storeName == "22" >selected="selected"</#if></#if>>上海-崔玉涛育学园</option>
-                    <option value="23" <#if salesOrder.storeName??><#if salesOrder.storeName == "23" >selected="selected"</#if></#if>>简二家</option>
-                    <option value="24" <#if salesOrder.storeName??><#if salesOrder.storeName == "24" >selected="selected"</#if></#if>>科学育儿</option>
-                    <option value="25" <#if salesOrder.storeName??><#if salesOrder.storeName == "25" >selected="selected"</#if></#if>>美康辰</option>
-                    <option value="26" <#if salesOrder.storeName??><#if salesOrder.storeName == "26" >selected="selected"</#if></#if>>北京悦祺</option>
-                    <option value="27" <#if salesOrder.storeName??><#if salesOrder.storeName == "27" >selected="selected"</#if></#if>>上海淘宝</option>
-                    <option value="28" <#if salesOrder.storeName??><#if salesOrder.storeName == "28" >selected="selected"</#if></#if>>蓝极风</option>
-                    <option value="29" <#if salesOrder.storeName??><#if salesOrder.storeName == "29" >selected="selected"</#if></#if>>小莉团购</option>
-                    <option value="30" <#if salesOrder.storeName??><#if salesOrder.storeName == "30" >selected="selected"</#if></#if>>超级妈咪团</option>
-                    <option value="31" <#if salesOrder.storeName??><#if salesOrder.storeName == "31" >selected="selected"</#if></#if>>艾德叔叔</option>
-                    <option value="32" <#if salesOrder.storeName??><#if salesOrder.storeName == "32" >selected="selected"</#if></#if>>钱儿频道</option>
-                    <option value="33" <#if salesOrder.storeName??><#if salesOrder.storeName == "33" >selected="selected"</#if></#if>>尹建莉</option>
-                    <option value="34" <#if salesOrder.storeName??><#if salesOrder.storeName == "34" >selected="selected"</#if></#if>>老虎工作室</option>
-                    <option value="35" <#if salesOrder.storeName??><#if salesOrder.storeName == "35" >selected="selected"</#if></#if>>有赞</option>
-                    <option value="37" <#if salesOrder.storeName??><#if salesOrder.storeName == "37" >selected="selected"</#if></#if>>深圳鑫之鹏</option>
-                    <option value="38" <#if salesOrder.storeName??><#if salesOrder.storeName == "38" >selected="selected"</#if></#if>>东西儿童教育</option>-->
                 </select>
-               <#-- <label class="form-label col-3 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>是否已发货：</label>
-                <div class="formControls col-4 col-sm-4"style="padding: 0 0;width: 383px;">
-                <span class="select-box">
-                        <select name="cooperativeState" class="select">
-                            <option value="1">是</option>
-                            <option value="2">否</option>
-                        </select>
-                </span>
-                </div>-->
             <#--Efast add end-->
             <input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesOrderId!}" placeholder="百胜订单号" name="salesOrderId" id="salesOrderId">
+            <input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesDealCode!}" placeholder="交易号" name="salesDealCode" id="salesDealCode">
             <input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressName!}" placeholder="收货人姓名" name="salesAddressName" id="salesAddressName">
             <input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressTel!}" placeholder="收货人电话" name="salesAddressTel" id="salesAddressTel">
             <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.startDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>-
@@ -135,8 +89,6 @@
             <button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i>上传第三方平台订单</button>
             <button onClick="upFiles2();"  class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i>上传发货信息</button>
             <button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载第三方平台的发货信息"><i class="Hui-iconfont">&#xe640;</i> 下载发货后订单</button>
-
-            </div>
         </form>
     </div>
 
@@ -387,26 +339,44 @@
         });
     }
 
-    /*导出Excel
-    $('#order_excel').click(function (e) {
-        var salesOrderId = convertUndefinedToEmpty($('#salesOrderId').val());
-        var salesAddressName = convertUndefinedToEmpty($('#salesAddressName').val());
-        var salesAddressTel = convertUndefinedToEmpty($('#salesAddressTel').val());
-        var startDate = convertUndefinedToEmpty($('#startDate').val());
-        var endDate = convertUndefinedToEmpty($('#endDate').val());
-        window.location="${path}/admin/salesOrder/sales_order_excel?salesOrderId="+salesOrderId+
-        "&salesAddressName="+salesAddressName+"&salesAddressTel="+salesAddressTel+"&startDate="+
-        startDate+"&endDate="+endDate;
-    })*/
-
     /*导出上传到efast的Excel*/
     $('#order_excel').click(function (e) {
-       var isHaveImport = $("#isHaveImport").val();
-       var isDeliverGoods = $("#isDeliverGoods").val();
-       var salesStoreId = $("#salesStoreId").val();
-       var startDate = $("#startDate").val();
-       var endDate = $("#endDate").val();
-        window.location="${path}/admin/salesOrder/download_efast_order?isHaveImport="+isHaveImport+"&isDeliverGoods="+isDeliverGoods+"&salesStoreId="+salesStoreId+"&startDate="+startDate+"&endDate="+endDate;
+        var isHaveImport = $("#isHaveImport").val(); //是否导出
+        var isDeliverGoods = $("#isDeliverGoods").val(); //是否已发货
+        var salesStoreId = $("#salesStoreId").val(); //店铺
+        var startDate = $("#startDate").val();
+        var endDate = $("#endDate").val();
+        var salesOrderId = $("#salesOrderId").val();
+        var salesDealCode = $("#salesDealCode").val();
+        var salesAddressName = $("#salesAddressName").val();
+        var salesAddressTel = $("#salesAddressTel").val();
+
+        $.ajax({
+            type:'POST',
+            url: '${path}/admin/salesOrder/sync_efast_order_num',
+            data:{
+                "isHaveImport" : isHaveImport,
+                "isDeliverGoods" : isDeliverGoods,
+                "salesStoreId" : salesStoreId,
+                "startDate" : startDate,
+                "endDate" : endDate,
+                "salesOrderId" : salesOrderId,
+                "salesDealCode" : salesDealCode,
+                "salesAddressName" : salesAddressName,
+                "salesAddressTel" : salesAddressTel
+
+            },
+            dataType: 'json',
+            async: false,
+            success:function(res) {
+                if(res.resultCode != 200){
+                    layer.msg(res.resultMsg,{icon: 2,time:3000});
+                    return false;
+                }else{
+                    window.location="${path}/admin/salesOrder/download_efast_order?isHaveImport="+isHaveImport+"&isDeliverGoods="+isDeliverGoods+"&salesStoreId="+salesStoreId+"&startDate="+startDate+"&endDate="+endDate+"&salesOrderId="+salesOrderId+"&salesDealCode="+salesDealCode+"&salesAddressName="+salesAddressName+"&salesAddressTel="+salesAddressTel;
+                }
+            }
+        });
     })
 
 </script>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/probationShopOrderMapper.xml

@@ -411,7 +411,7 @@
 		sales_post_num= #{salesPostNum},
 		sales_post_firm= #{salesPostFirm},
 		sales_send_date= #{salesSendDate},
-		sales_send_date= '5'
+		sales_status= '5'
 		where
 		sales_orderid = #{salesOrderid}
 	</update>

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -142,8 +142,8 @@ public class MQTask implements InitializingBean {
 	 * 根据订单号拉取物流信息
 	 * @throws Exception
 	 */
-	//@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
-	@Scheduled(cron = "0 0/2 * * * ?")//每2分钟执行一次
+	@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
+	//@Scheduled(cron = "0 0/2 * * * ?")//每2分钟执行一次
 	//@Scheduled(cron = "*/10 * * * * ?")
 	public void syncLgisticsInfoByOrderId() throws Exception {
 		System.out.println("---------------- 根据订单号拉取物流信息开始 ---------------");

wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -146,8 +146,8 @@ public class MQTask implements InitializingBean {
 	 * 根据订单号拉取物流信息
 	 * @throws Exception
 	 */
-	//@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
-	@Scheduled(cron = "0 0/2 * * * ?")//每2分钟执行一次
+	@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
+	//@Scheduled(cron = "0 0/2 * * * ?")//每2分钟执行一次
 	//@Scheduled(cron = "*/10 * * * * ?")
 	public void syncLgisticsInfoByOrderId() throws Exception {
 		logger.info("---------------- 根据订单号拉取物流信息开始 ---------------");