客户系统修改

watero-rst-interface/src/main/java/com/iamberry/rst/faces/dm/DmDealerService.java

@@ -48,5 +48,11 @@ public interface DmDealerService {
      * @return Integer
      */
     Integer  update(DmDealer  dmDealer);
+    /**
+     * 修改数据
+     * @param  dmDealer
+     * @return Integer
+     */
+    Integer  updateDmDealer(DmDealer  dmDealer);
 
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/DmDealerServiceImpl.java

@@ -256,4 +256,9 @@ public class DmDealerServiceImpl  implements DmDealerService {
         return flag;
     }
 
+    @Override
+    public Integer updateDmDealer(DmDealer dmDealer) {
+        return  dmDealerMapper.update(dmDealer);
+    }
+
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/DmDealerController.java

@@ -71,7 +71,7 @@ public class DmDealerController {
         ModelAndView mv = new ModelAndView("dm/dealer/dealer_list");
 
         Admin admin = AdminUtils.getLoginAdmin();
-        if(admin.getAdminDept() != 2){
+        if(admin.getAdminDept() != 1){
             //获取登录员工id
             Integer adminId = AdminUtils.getLoginAdminId();
             dmDealer.setCreateId(adminId);
@@ -422,4 +422,29 @@ public class DmDealerController {
         }
     }
 
+
+
+    /**
+     * 修改
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("dm:dealer:update")
+    @RequestMapping("/update_dealer_status")
+    public ResponseJson dealereSave(HttpServletRequest request,DmDealer dmDealer) {
+        ResponseJson rj = ResponseJson.getSUCCESS();
+
+        Integer flag = 0;
+        flag = dmDealerService.updateDmDealer(dmDealer);
+
+        if(flag > 0){
+            rj.setResultMsg("添加成功");
+            return rj;
+        }else{
+            rj = ResponseJson.getFAILURE();
+            return  rj;
+        }
+    }
+
 }

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

@@ -558,7 +558,7 @@ public class ExcelUtil {
                     if(colorDiscount != null && !"".equals(colorDiscount)){
                         colorDiscount = colorDiscount.replaceAll("\\r|\\r|\\n","");
                     }
-                    if(colorDiscount == null || "".equals(colorDiscount) || Integer.valueOf(colorDiscount) == 0){
+                    if(colorDiscount == null || "".equals(colorDiscount)){
                         order.setReturnStatus("error");
                         order.setReturnMsg("价格不正确");
                         // 读取购买数量

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/add_dealer.ftl

@@ -270,7 +270,7 @@
     var CONTACT_TR_NUM =  0; //对接人 的 数量  1：表示有   0：表示没有
     var CHANNEL_TR_NUM = 0; //渠道信息数量  1：表示有   0：表示没有
     var PRODUCT_TR_NUM = 0; //渠道信息数量  1：表示有   0：表示没有
-    var COOPERATIONAGREE_TR_NUM = 0; //渠道信息数量  1：表示有   0：表示没有
+    var COOPERATIONAGREE_TR_NUM = 0; //产品信息数量  1：表示有   0：表示没有
 
 
 </script>

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/dealer_list.ftl

@@ -120,15 +120,17 @@
                                     <font color=#06c>修改</font>
                                 </a>
 
-                                <#--<#if question.questionState == 1>
+                                <#if dmDealer.dealerStatus == 1>
                                     <a style="text-decoration:none" href="javascript:void(0);" title="禁用" onclick="forbid(${dmDealer.dealerId!''},2)">
                                         <font color=#06c>禁用</font>
                                     </a>
-                                <#elseif question.questionState == 2>
+                                <#elseif dmDealer.dealerStatus == 2>
                                     <a style="text-decoration:none" href="javascript:void(0);" title="启用" onclick="forbid(${dmDealer.dealerId!''},1)">
                                         <font color=#06c>启用</font>
                                     </a>
                                 </#if>
+
+                                <#--
                                 &nbsp;
                                 <a style="text-decoration:none" href="javascript:void(0);" title="修改" onclick="toUpdateQuestion(${dmDealer.dealerId!''})">
                                     <font color=#06c>修改</font>
@@ -173,25 +175,18 @@
     }
 
     /**
-     * 查看详情
-     */
-    function detail(questionId){
-        layer_show_norm("问题详情","${path}/admin/complaintQuestion/to_question_detail?questionId="+questionId,4);
-    }
-
-    /**
      * 禁用
      * @param questionId
      * @param state
      */
-    function forbid(questionId,state) {
+    function forbid(dealerId,state) {
         $.ajax({
             type: "POST",
             data: {
-                "questionId" :questionId,
-                "questionState" :state
+                "dealerId" :dealerId,
+                "dealerStatus" :state
             },
-            url: "${path}/admin/complaintQuestion/update_question",
+            url: "${path}/admin/dealer/update_dealer_status",
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {

watero-rst-web/src/main/webapp/common/js/dealer/dealer.js

@@ -329,75 +329,97 @@ $(function(){
             var flag = false;
         },
         beforeSubmit: function (curform) {  //验证通过之后执行的函数
-            var contactArray = new Array();
-            $("#add_contact").find("tr").each(function () {
-                var $contact = $(this);
-                var contact = new Object();
-                contact.dealContactId = $contact.find(".dealContactId").val();
-                contact.dealContactStr = $contact.find(".dealContactStr").val();
-                contact.dealContactName= $contact.find(".dealContactName").text();
-                contact.dealContactPhone=$contact.find(".dealContactPhone").text();
-                contact.dealContactType=$contact.find(".dealContactType").text();
-                contact.dealContactEmail=$contact.find(".dealContactEmail").text();
-                contact.dealContactWechat=$contact.find(".dealContactWechat").text();
-                contact.dealContactQq=$contact.find(".dealContactQq").text();
-                contactArray.push(contact);
-            });
-            if(contactArray.length > 0){
-                $("#add_contact_json").val(JSON.stringify(contactArray));
+            if(CONTACT_TR_NUM  > 0){
+                var contactArray = new Array();
+                $("#add_contact").find("tr").each(function () {
+                    var $contact = $(this);
+                    var contact = new Object();
+                    contact.dealContactId = $contact.find(".dealContactId").val();
+                    contact.dealContactStr = $contact.find(".dealContactStr").val();
+                    contact.dealContactName= $contact.find(".dealContactName").text();
+                    contact.dealContactPhone=$contact.find(".dealContactPhone").text();
+                    contact.dealContactType=$contact.find(".dealContactType").text();
+                    contact.dealContactEmail=$contact.find(".dealContactEmail").text();
+                    contact.dealContactWechat=$contact.find(".dealContactWechat").text();
+                    contact.dealContactQq=$contact.find(".dealContactQq").text();
+                    contactArray.push(contact);
+                });
+                if(contactArray.length > 0){
+                    $("#add_contact_json").val(JSON.stringify(contactArray));
+                }else{
+                    vailErrorMsg_3($("#add_contact_make"),"必须要有一个对接人");
+                    return false;
+                }
             }else{
                 vailErrorMsg_3($("#add_contact_make"),"必须要有一个对接人");
                 return false;
             }
 
-            var channelArray = new Array();
-            $("#add_dealer_channel").find("tr").each(function () {
-                var $contact = $(this);
-                var channel = new Object();
-                channel.dealChannelId = $contact.find(".dealChannelId").val();
-                channel.dealChannelIdStr = $contact.find(".dealChannelIdStr").val();
-                channel.channelId= $contact.find(".channelId").val();
-                channel.channelTypeId= $contact.find(".channelTypeId").val();
-                channel.storeId=$contact.find(".storeId").val();
-                channel.dealChannelAccountPeriod=$contact.find(".dealChannelAccountPeriod").text();
-                channelArray.push(channel);
-            });
-            if(channelArray.length > 0){
-                $("#add_dealer_channel_json").val(JSON.stringify(channelArray));
+            if(CHANNEL_TR_NUM > 0){
+                var channelArray = new Array();
+                $("#add_dealer_channel").find("tr").each(function () {
+                    var $contact = $(this);
+                    var channel = new Object();
+                    channel.dealChannelId = $contact.find(".dealChannelId").val();
+                    channel.dealChannelIdStr = $contact.find(".dealChannelIdStr").val();
+                    channel.channelId= $contact.find(".channelId").val();
+                    channel.channelTypeId= $contact.find(".channelTypeId").val();
+                    channel.storeId=$contact.find(".storeId").val();
+                    channel.dealChannelAccountPeriod=$contact.find(".dealChannelAccountPeriod").text();
+                    channelArray.push(channel);
+                });
+                if(channelArray.length > 0){
+                    $("#add_dealer_channel_json").val(JSON.stringify(channelArray));
+                }else{
+                    vailErrorMsg_3($("#add_dealer_channel_make"),"必须要有一个渠道信息");
+                    return false;
+                }
             }else{
                 vailErrorMsg_3($("#add_dealer_channel_make"),"必须要有一个渠道信息");
                 return false;
             }
 
-            var productColorArray = new Array();
-            $("#add_product").find("tr").each(function () {
-                var $productColor = $(this);
-                var productColor = new Object();
-                productColor.colorId = $productColor.find(".colorId").val();
-                productColor.dealProdStoreArea = $productColor.find(".dealProdStoreArea").val();
-                var dealProdPrice =  $productColor.find(".dealProdPrice").val();
-                productColor.dealProdPrice = accMul(dealProdPrice,100);
-                productColor.dealerProductStoreIds = $productColor.find(".dealerProductStoreIds").val();
-                productColorArray.push(productColor);
-            });
-            if(productColorArray.length > 0){
-                $("#add_product_json").val(JSON.stringify(productColorArray));
+            if(PRODUCT_TR_NUM > 0){
+                var productColorArray = new Array();
+                var needPrice = true;
+                $("#add_product").find("tr").each(function () {
+                    var $productColor = $(this);
+                    var productColor = new Object();
+                    productColor.colorId = $productColor.find(".colorId").val();
+                    productColor.dealProdStoreArea = $productColor.find(".dealProdStoreArea").val();
+                    var dealProdPrice =  $productColor.find(".dealProdPrice").val();
+                    if(!isEmpty(dealProdPrice)){
+                        needPrice = false;
+                    }
+                    productColor.dealProdPrice = accMul(dealProdPrice,100);
+                    productColor.dealerProductStoreIds = $productColor.find(".dealerProductStoreIds").val();
+                    productColorArray.push(productColor);
+                });
+                if(!needPrice){
+                    vailErrorMsg_3($("#add_product_make"),"请填写价格。");
+                    return false;
+                }
+                if(productColorArray.length > 0){
+                    $("#add_product_json").val(JSON.stringify(productColorArray));
+                }
             }
 
-            var productColorArray = new Array();
-            $("#add_coop_agree").find("tr").each(function () {
-                var $coopAgree = $(this);
-                var coopAgree = new Object();
-                coopAgree.coopAgreeId = $coopAgree.find(".coopAgreeId").val();
-                coopAgree.coopAgreeIdStr = $coopAgree.find(".coopAgreeIdStr").val();
-                coopAgree.coopAgreeImg = $coopAgree.find(".coopAgreeImg").val();
-                coopAgree.coopAgreeBeforeDate = $coopAgree.find(".coopAgreeBeforeDate").val();
-                coopAgree.coopAgreeEndDate = $coopAgree.find(".coopAgreeEndDate").val();
-                coopAgree.coopAgreeRemake= $coopAgree.find(".coopAgreeRemake").text();
-                productColorArray.push(coopAgree);
-            });
-            if(productColorArray.length > 0){
-                $("#add_coop_agree_json").val(JSON.stringify(productColorArray));
+            if(COOPERATIONAGREE_TR_NUM > 0){
+                var coopAgreeArray = new Array();
+                $("#add_coop_agree").find("tr").each(function () {
+                    var $coopAgree = $(this);
+                    var coopAgree = new Object();
+                    coopAgree.coopAgreeId = $coopAgree.find(".coopAgreeId").val();
+                    coopAgree.coopAgreeIdStr = $coopAgree.find(".coopAgreeIdStr").val();
+                    coopAgree.coopAgreeImg = $coopAgree.find(".coopAgreeImg").val();
+                    coopAgree.coopAgreeBeforeDate = $coopAgree.find(".coopAgreeBeforeDate").val();
+                    coopAgree.coopAgreeEndDate = $coopAgree.find(".coopAgreeEndDate").val();
+                    coopAgree.coopAgreeRemake= $coopAgree.find(".coopAgreeRemake").text();
+                    coopAgreeArray.push(coopAgree);
+                });
+                if(coopAgreeArray.length > 0){
+                    $("#add_coop_agree_json").val(JSON.stringify(coopAgreeArray));
+                }
             }
 
             loadIndex = layer.load(1, {