修改客户信息

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

@@ -226,9 +226,10 @@ public class CustomerBasicController {
         ticketOpeningInfo.setCustomerId(Integer.valueOf(customerId));
         ticketOpeningInfo = customerBasicService.getOpeningInfo(ticketOpeningInfo);
         /*渠道销售信息*/
-        /*ChannelSaleInfo channelSaleInfo = new ChannelSaleInfo();
-        channelSaleInfo.setCustomerId(Integer.valueOf(customerId));*/
-        List<ChannelDivisionInfo> listChannelDivisionInfo = customerBasicService.listChannelDivisionInfo(Integer.valueOf(customerId));
+        ChannelSaleInfo channelSaleInfo = new ChannelSaleInfo();
+        channelSaleInfo.setCustomerId(Integer.valueOf(customerId));
+        //List<ChannelDivisionInfo> listChannelDivisionInfo = customerBasicService.listChannelDivisionInfo(Integer.valueOf(customerId));
+        List<ChannelSaleInfo> listChannelSaleInfo = customerBasicService.listChannelSaleInfo(channelSaleInfo);
         //渠道销售信息封装
        /* List<ChannelDivisionInfo> listChannelDivisionInfo = new ArrayList<ChannelDivisionInfo>();
         for (int i=0;i<listChannelSaleInfo.size();i++){
@@ -269,7 +270,7 @@ public class CustomerBasicController {
         mv.addObject("listDockedContactInfo",listDockedContactInfo);
         mv.addObject("billingInfo",billingInfo);
         mv.addObject("ticketOpeningInfo",ticketOpeningInfo);
-        mv.addObject("listChannelDivisionInfo",listChannelDivisionInfo);
+        mv.addObject("listChannelSaleInfo",listChannelSaleInfo);
         return mv;
     }
 

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

@@ -239,7 +239,22 @@
                     </tr>
                     </thead>
                     <tbody id="channelSaleListId">
+
+                    <#if listChannelSaleInfo?? &&  (listChannelSaleInfo?size > 0) >
+                        <#list listChannelSaleInfo as list>
+                        <tr>
+                            <td>${list.channelCategory!''}</td>
+                            <td>${list.channelType!''}</td>
+                            <td>${list.channelName!''}</td>
+                            <td>${list.promotingProducts!''}</td>
+                            <td>${list.supplyPrice!''}</td>
+                            <td>${list.accountPeriod!''}</td>
+                            <td><a href='javascript:;' onclick='deleteChannelSale(this)'>删除</a></td>
+                        </tr>
+                        </#list>
+                    <#else>
                     <tr><td colspan="7" class="td-manage text-c" >暂时没有客户销售渠道信息，请添加！</td></tr>
+                    </#if>
                     </tbody>
                 </table>
             </div>