修改客诉BUG

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -113,6 +113,7 @@ public class MQTask implements InitializingBean {
 	@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
 	//@Scheduled(cron = "*/10 * * * * ?")
 	public void syncEfastOrderList() throws Exception {
+		logger.info("---------------- 批量同步百胜订单开始 ---------------");
 		int pageNo = 1;
 		int pageSize = 20;
 		boolean flag = false;	//控制是否还需要获取百胜订单信息
@@ -142,6 +143,7 @@ public class MQTask implements InitializingBean {
 				salesOrderService.addSalesOrderList(obj);
 			} while (flag);    //百胜返回条目数如果等于设置的分页条目数，则继续查询下一页
 		}
+		logger.info("---------------- 批量同步百胜订单结束 ---------------");
 	}
 
 	/**

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

@@ -831,6 +831,7 @@ public class AdminOrderController {
                                        @RequestParam("productName") String productName,
                                        @RequestParam("shopId") String shopId,
                                        HttpServletRequest request) throws Exception {
+        logger.info("-----------根据excel内容推送到百胜开始,Excel路径："+ filePath +"-----------");
         // 获取产品颜色的映射
         List<ProductColor> productColors = orderService.listProductColor();
         Map<String, ProductColor> priceMap = new HashMap<>();
@@ -840,7 +841,7 @@ public class AdminOrderController {
         // 读取文件中内容
         List<EfastOrder> orderEfasts = ExcelUtil.readCell(request.getServletContext().getRealPath(filePath),
                 productName, maps, infos, tel, name,platformOrder, num, priceMap, postType, shopId);
-
+        logger.info("---------orderEfasts订单个数为："+orderEfasts.size() + "------------");
         StringBuffer sb = new StringBuffer();
         for (int i = 0; i < orderEfasts.size(); i++) {
             sb.append(orderEfasts.get(i).getPlatformOrderId().trim() + "@");

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

@@ -92,11 +92,11 @@
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>来源入口：</label>
                 <div class="formControls col-10 col-sm-10 skin-minimal">
                     <div class="radio-box">
-                        <input type="radio" id="tel-1" name="customerSourceType" value="1" datatype="*"  checked nullmsg="请选择来源入口！">
+                        <input type="radio" id="tel-1" name="customerSourceType" value="1" >
                         <label for="tel-1">400电话</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-2" name="customerSourceType" value="2">
+                        <input type="radio" id="tel-2" name="customerSourceType" value="2" checked>
                         <label for="tel-2">微信公众号</label>
                     </div>
                     <div class="radio-box">

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

@@ -100,6 +100,7 @@
                             <option value="27">上海淘宝</option>
                             <option value="28">蓝极风</option>
                             <option value="29">小莉团购</option>
+                            <option value="30">超级妈咪团</option>
                         </select>
                     </label>
                 </td>