添加客户基本信息

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/CustomerBasicServiceImpl.java

@@ -108,19 +108,22 @@ public class CustomerBasicServiceImpl implements CustomerBasicService{
         int customerId = -1;
         int channelDivisionId = -1;
         try {
-            customerId = customerBasicInfoSaveMapper.saveCustomerBasicInfo(customerBasicInfo);
+            customerBasicInfoSaveMapper.saveCustomerBasicInfo(customerBasicInfo);
+            customerId = customerBasicInfo.getCustomerId();
             if(customerId != -1){
-                if(dockedContactInfoList != null && dockedContactInfoList.size()>0){
+                if(dockedContactInfoList != null && dockedContactInfoList.size()>1){
+                    dockedContactInfoList.remove(0);
                     for (DockedContactInfo dockedContactInfo: dockedContactInfoList) {
                         dockedContactInfo.setCustomerId(customerId);
                         customerBasicInfoSaveMapper.saveDockedContactInfo(dockedContactInfo);
                     }
                 }
-                if(channelSaleInfoList != null && channelSaleInfoList.size()>0){
+                if(channelSaleInfoList != null && channelSaleInfoList.size()>1){
+                    channelSaleInfoList.remove(0);
                     for (ChannelSaleInfo channelSaleInfo: channelSaleInfoList) {
                         channelSaleInfo.setCustomerId(customerId);
-                        channelDivisionId = customerBasicInfoSaveMapper.saveChannelDivisionInfo(channelSaleInfo);
-                        channelSaleInfo.setChannelDivisionId(channelDivisionId);
+                        customerBasicInfoSaveMapper.saveChannelDivisionInfo(channelSaleInfo);
+                        //channelSaleInfo.setChannelDivisionId(channelDivisionId);
                         customerBasicInfoSaveMapper.saveChannelSaleInfo(channelSaleInfo);
                     }
                 }

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/mapper/CustomerBasicMapper.java

@@ -34,7 +34,7 @@ public interface CustomerBasicMapper {
      * @param customerBasicInfo
      * @return
      */
-    public int saveCustomerBasicInfo(CustomerBasicInfo customerBasicInfo);
+    public void saveCustomerBasicInfo(CustomerBasicInfo customerBasicInfo);
 
     /**
      * 添加对接联系人信息
@@ -58,7 +58,7 @@ public interface CustomerBasicMapper {
      * @param channelSaleInfo
      * @return
      */
-    public int saveChannelDivisionInfo(ChannelSaleInfo channelSaleInfo);
+    public void saveChannelDivisionInfo(ChannelSaleInfo channelSaleInfo);
 
     /**
      * 添加付款/退款信息

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/mapper/CustomerBasicMapper.xml

@@ -295,10 +295,7 @@
 
     <!--新增部分 start-->
     <!-- 添加客户基本信息 -->
-    <insert id="saveCustomerBasicInfo" parameterType="CustomerBasicInfo">
-        <selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="customerId">
-            SELECT LAST_INSERT_ID() AS id
-        </selectKey>
+    <insert id="saveCustomerBasicInfo" parameterType="CustomerBasicInfo" useGeneratedKeys="true"  keyProperty="customerId">
         INSERT INTO
         tb_rst_customer_basic_info
         (
@@ -326,7 +323,7 @@
     </insert>
 
     <!-- 添加客户销售渠道备案信息（渠道表） -->
-    <insert id="saveChannelDivisionInfo" parameterType="ChannelSaleInfo">
+    <insert id="saveChannelDivisionInfo" parameterType="ChannelSaleInfo" useGeneratedKeys="true"  keyProperty="channelDivisionId">
         INSERT INTO
         tb_rst_channel_division_info
         (