添加客户基本信息

watero-rst-web/src/main/java/com/iamberry/rst/controllers/customer/CustomerBasicInfoSaveController.java

@@ -53,9 +53,16 @@ public class CustomerBasicInfoSaveController {
     @ResponseBody
     @RequiresPermissions("customerBasic:save:customerInfo")
     @RequestMapping("/save_customer_info")
-   public ResponseJson saveCustomerBasicInfo(HttpServletRequest request,String customerInfoJson,/*String dockedContactInfoListJson,String channelSaleInfoListJson,*/
-                                              String billingInfoJson,String ticketOpeningInfoJson) throws Exception {
+    public ResponseJson saveCustomerBasicInfo(HttpServletRequest request,String customerInfoJson,String dockedContactInfoListJson,
+                                                String channelSaleInfoListJson,String billingInfoJson,String ticketOpeningInfoJson) throws Exception {
+        JSONArray jsonArray;
+        List<DockedContactInfo> dockedContactInfoList;
+        List<ChannelSaleInfo> channelSaleInfoList;
+        jsonArray = JSONArray.fromObject(dockedContactInfoListJson);
+        dockedContactInfoList = (List) JSONArray.toCollection(jsonArray, DockedContactInfo.class);
 
+        jsonArray = JSONArray.fromObject(channelSaleInfoListJson);
+        channelSaleInfoList = (List) JSONArray.toCollection(jsonArray, ChannelSaleInfo.class);
         JSONObject customerJsonObject =  JSONObject.fromObject(customerInfoJson);
         CustomerBasicInfo customerBasicInfo = (CustomerBasicInfo) customerJsonObject.toBean(customerJsonObject,CustomerBasicInfo.class);
 
@@ -65,13 +72,6 @@ public class CustomerBasicInfoSaveController {
         JSONObject ticketOpeningInfoJsonObject =  JSONObject.fromObject(ticketOpeningInfoJson);
         TicketOpeningInfo ticketOpeningInfo = (TicketOpeningInfo) customerJsonObject.toBean(customerJsonObject,TicketOpeningInfo.class);
         logger.info("-----------------saveCustomerBasicInfo...Start----------------------");
-//        CustomerBasicInfo customerBasicInfo = customerBasicInfoSaveForm.getCustomerBasicInfo();
-        //String customerBasicInfoSaveForm = request.getParameter("customerBasicInfoSaveForm");
-        //CustomerBasicInfo customerBasicInfo = new CustomerBasicInfo();
-//        List<DockedContactInfo> dockedContactInfoList = customerBasicInfoSaveForm.getDockedContactInfoList();
-//         List<ChannelSaleInfo> channelSaleInfoList = customerBasicInfoSaveForm.getChannelSaleInfoList();
-//        BillingInfo billingInfo = customerBasicInfoSaveForm.getBillingInfo();
-//        TicketOpeningInfo ticketOpeningInfo = customerBasicInfoSaveForm.getTicketOpeningInfo();
         ResponseJson rjx = this.isValiData(customerBasicInfo);
         Boolean isSaveSuccess = false;//是否保存成功标识
         if(rjx.getResultCode() == 500){