订单中心开发

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

@@ -99,7 +99,7 @@ public class SalesOrder implements Serializable {
     private String salesBatchId;            //批次编号
     private Date batchCreateTime;           //批次创建时间
 
-    private Integer salesAddType;           //增加订单方式 1：手动增加 2：Excel导入
+    private Integer salesAddType;           //增加订单方式 1：手动增加 2：Excel导入 3：客诉增加订单
     private Integer salesAdminId;           //录入人id
 
     private Integer salesCustomerId;           //客诉id

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

@@ -97,7 +97,7 @@
         AND sales_orderId = #{salesOrderId}
       </if>
       <if test="salesDealCode !=null and salesDealCode !=''">
-        AND sales_deal_code = {salesDealCode}
+        AND sales_deal_code = #{salesDealCode}
       </if>
       <if test="salesAddressTel !=null and salesAddressTel !=''">
         AND sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
@@ -176,19 +176,19 @@
         AND sales_store_id = #{salesStoreId}
       </if>
       <if test="salesId !=null">
-        o.sales_id like CONCAT('%',#{salesId},'%')
+        o.sales_id = #{salesId}
       </if>
       <if test="salesOrderId !=null and salesOrderId !=''">
-        AND o.sales_orderId like CONCAT('%',#{salesOrderId},'%')
+        AND o.sales_orderId = #{salesOrderId}
       </if>
       <if test="salesDealCode !=null and salesDealCode !=''">
-        AND o.sales_deal_code like CONCAT('%',#{salesDealCode},'%')
+        AND o.sales_deal_code = #{salesDealCode}
       </if>
       <if test="salesAddressTel !=null and salesAddressTel !=''">
-        AND o.sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
+        AND o.sales_address_tel = #{salesAddressTel}
       </if>
       <if test="salesAddressName !=null and salesAddressName !=''">
-        AND o.sales_address_name like CONCAT('%',#{salesAddressName},'%')
+        AND o.sales_address_name = #{salesAddressName}
       </if>
       <if test="salesBatchId !=null and salesBatchId !=''">
         AND sales_batch_id = #{salesBatchId}
@@ -224,26 +224,26 @@
         <if test="salesStatus !=null ">
            AND sales_status = #{salesStatus}
         </if>
-        <if test="salesShippingStatus !=null and salesShippingStatus !=''">
+        <if test="salesShippingStatus !=null">
           AND sales_shipping_status = #{salesShippingStatus}
         </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},'%')
+              o.sales_id = #{salesId}
+          </if>
+          <if test="salesOrderId !=null and salesOrderId !=''">
+              AND o.sales_orderId = #{salesOrderId}
+          </if>
+          <if test="salesDealCode !=null and salesDealCode !=''">
+              AND o.sales_deal_code = #{salesDealCode}
+          </if>
+          <if test="salesAddressTel !=null and salesAddressTel !=''">
+              AND o.sales_address_tel = #{salesAddressTel}
+          </if>
+          <if test="salesAddressName !=null and salesAddressName !=''">
+              AND o.sales_address_name = #{salesAddressName}
         </if>
         <if test="salesBatchId !=null and salesBatchId !=''">
           AND sales_batch_id = #{salesBatchId}

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

@@ -100,6 +100,8 @@ public class AdminCustomerController {
     private EfastOrderService efastOrderService;
     @Autowired
     private RelationOrderService relationOrderService;
+    @Autowired
+    private GenerateKeyUtil generateKeyUtil ;
 
 
     /**
@@ -450,10 +452,12 @@ public class AdminCustomerController {
         salesOrder.setSalesShippingFee(0); //邮费
 
         Integer adminId = AdminUtils.getLoginAdminId();
-        String orderCode = OrderNoUtil.createOrderCode(adminId);
+        String orderCode = GenerateKeyUtil.createOrderCode(adminId);
         salesOrder.setSalesDealCode(orderCode);
         salesOrder.setSalesOrderId(orderCode);
 
+        salesOrder.setSalesBatchId(generateKeyUtil.getSalesBatchIdKS());
+
         //salesOrder = salesOrderService.addOrderAndIteminfo(salesOrder,list);
         salesOrder.setSalesOrderItemList(list);
 

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

@@ -315,26 +315,26 @@ public class AppComplaintQuestionInfoController {
      * @param request
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "/synRelatedOrder")
-    public ResponseJson synRelatedOrder(HttpServletRequest request){
-        ResponseJson msg = new ResponseJson();
-        List<RelationOrder>  relationOrderList = relationOrderService.getRelationOrderList(new RelationOrder());
-        for (int i=0;i<relationOrderList.size();i++) {
-            RelationOrder ro = relationOrderList.get(i);
-            CustomerCommon customerCommon = new CustomerCommon();
-            customerCommon.setRelationId(ro.getRelationId());
-            customerCommon.setCustomerIsSolve(ro.getRelationType());  //customerIsSolve
-            List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
-
-            RelationOrder newRo = new RelationOrder();
-            newRo.setRelationOrderId(ro.getRelationOrderId());
-            newRo.setRelationCustomerId(customerCommonList.get(0).getCustomerId());
-            relationOrderService.update(newRo);
-        }
-        logger.info("----交易号为空--订单id为"+1);
-        return msg;
-    }
+//    @ResponseBody
+//    @RequestMapping(value = "/synRelatedOrder")
+//    public ResponseJson synRelatedOrder(HttpServletRequest request){
+//        ResponseJson msg = new ResponseJson();
+//        List<RelationOrder>  relationOrderList = relationOrderService.getRelationOrderList(new RelationOrder());
+//        for (int i=0;i<relationOrderList.size();i++) {
+//            RelationOrder ro = relationOrderList.get(i);
+//            CustomerCommon customerCommon = new CustomerCommon();
+//            customerCommon.setRelationId(ro.getRelationId());
+//            customerCommon.setCustomerIsSolve(ro.getRelationType());  //customerIsSolve
+//            List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
+//
+//            RelationOrder newRo = new RelationOrder();
+//            newRo.setRelationOrderId(ro.getRelationOrderId());
+//            newRo.setRelationCustomerId(customerCommonList.get(0).getCustomerId());
+//            relationOrderService.update(newRo);
+//        }
+//        logger.info("----交易号为空--订单id为"+1);
+//        return msg;
+//    }
 
 
 

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

@@ -1,18 +1,18 @@
 package com.iamberry.rst.utils;
 
 import com.iamberry.rst.core.cm.SalesOrder;
-import com.iamberry.rst.core.order.OrderBatch;
 import com.iamberry.rst.core.sys.SysConfig;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.order.OrderBatchService;
 import com.iamberry.rst.faces.sys.SysConfigService;
-import com.iamberry.wechat.tools.ResponseJson;
+import com.iamberry.wechat.tools.StaticInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Random;
 
 /***
  * 用于生成单号
@@ -50,6 +50,28 @@ public class GenerateKeyUtil {
     /*批量添加批次编号*/
     private final static String SC_BATCH = "C";
 
+    private static char[] chars = {
+            'G', 'I', 'J', 'K', 'L', 'M', 'N', 'U', 'V', 'W', 'Y', 'Z',
+            'P', 'Q', 'A', 'B', 'C', 'D', 'E', 'F', 'R', 'S', 'T'
+    };
+    public static Random random = new Random();
+    /**
+     * 产生一个订单编号
+     * @param id :为当前订单所属 用户id
+     */
+    public static String createOrderCode(Integer id) {
+        StringBuilder code = new StringBuilder();
+        code.append("KS");
+        //产生基本数据
+        code.append(StaticInfo.dateFormat.format(new Date()));
+        //避免同一秒内，操作多次
+        code.append(Math.abs(random.nextInt(1000)));
+        //避免多用户操作
+        code.append(id);
+        code.append(Math.abs(random.nextInt(1000)));
+        return code.toString();
+    }
+
     /**
      * 获取交易号-手动添加
      * @return
@@ -113,6 +135,14 @@ public class GenerateKeyUtil {
         return ("S"+ SC_BATCH + SDF_BATCH.format(new Date()) + String.format("%08d", number));
     }
 
+    /**
+     * 获取批次号 客诉录入
+     * @return
+     */
+    public String getSalesBatchIdKS(){
+        return ("KS00000000000001");
+    }
+
 
     /**
      * 产生4位随机数

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

@@ -772,11 +772,11 @@
     }
 
     /* 所有trim_input 样式，input框都需要去除前后空格*/
-    $(".trim_input").change(function(){
-        /*var value = $.trim($(this).val());*/
-        var val = $(this).val().replace(/\s/g, "");
-        $(this).val(val);
-    })
+//    $(".trim_input").change(function(){
+//        /*var value = $.trim($(this).val());*/
+//        var val = $(this).val().replace(/\s/g, "");
+//        $(this).val(val);
+//    })
 
 </script>
 </body>

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

@@ -176,6 +176,7 @@
                <#-- <input type="hidden" name="salesCompanyId" id="salesCompanyId" value="0">-->
                 <input type="hidden" name="salesPayType" id="salesPayType" value="1">
                 <input type="hidden" name="salesSendType" id="salesSendType" value="2">
+                <input type="hidden" name="salesAddType" id="salesAddType" value="3">
 
                 <div class="row cl" id="recipientInfo" style=" margin-top: 20px;">
                     <label class="form-label col-1 col-sm-1" style="width: 110px;"><span class="c-red">*</span>销售公司：</label>

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

@@ -514,7 +514,7 @@
         /*导出上传到efast的Excel*/
         $('#order_excel').click(function (e) {
             var salesIsDownload = $("#salesIsDownload").val(); //是否导出
-            var salesStatus = 1; //导出必须是确认状态
+            var salesStatus = 1; //订单状态
             var salesShippingStatus = $("#salesShippingStatus").val(); //是否已发货
             var salesStoreId = $("#salesStoreId").val(); //店铺
             var startDate = $("#startDate").val();
@@ -530,7 +530,7 @@
                 url: '${path}/admin/salesOrder/sync_efast_order_num',
                 data:{
                     "salesIsDownload" : salesIsDownload,
-                    "salesStatus" : salesStatus,
+//                    "salesStatus" : salesStatus,
                     "salesShippingStatus" : salesShippingStatus,
                     "salesStoreId" : salesStoreId,
                     "startDate" : startDate,