提供客户信息删除，收款信息删除，更精确的权限控制

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DealerProductStore.java

@@ -26,6 +26,9 @@ public class DealerProductStore  implements  Serializable{
     //店铺name
     private String storeName;
 
+    //客户id
+    private Integer dealerId;
+
     public Integer getProductStoreId(){
         return productStoreId;
     }
@@ -89,4 +92,12 @@ public class DealerProductStore  implements  Serializable{
     public void setDealChannelName(String dealChannelName) {
         this.dealChannelName = dealChannelName;
     }
+
+    public Integer getDealerId() {
+        return dealerId;
+    }
+
+    public void setDealerId(Integer dealerId) {
+        this.dealerId = dealerId;
+    }
 }

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

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

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

@@ -245,9 +245,11 @@ public class DmDealerServiceImpl  implements DmDealerService {
             }
         }
 
-        if(dmDealer.getDealerProductList().size() > 0){
-            dealerProductMapper.deleteByDealerId(dmDealer.getDealerId());
 
+        //删除供应产品关联渠道表
+        dealerProductStoreMapper.deleteByDealerId(dmDealer.getDealerId());
+        dealerProductMapper.deleteByDealerId(dmDealer.getDealerId());
+        if(dmDealer.getDealerProductList().size() > 0){
             for (DealerProduct dealerProduct:dmDealer.getDealerProductList()) {
                 dealerProduct.setDealerId(dmDealer.getDealerId());
             }
@@ -318,4 +320,43 @@ public class DmDealerServiceImpl  implements DmDealerService {
         return  dmDealerMapper.update(dmDealer);
     }
 
+    @Override
+    @Transactional
+    public Integer deleteDealer(Integer dealerId) {
+        //删除客户信息
+        Integer flag = dmDealerMapper.deleteDealer(dealerId);
+        if(flag < 1){
+            throw new RuntimeException("删除客户信息失败");
+        }
+
+        flag = dealerContactMapper.deleteByDealerId(dealerId);
+        if(flag < 1){
+            throw new RuntimeException("删除对接人信息失败");
+        }
+
+        //删除与店铺关联表
+        DealerChannel oldDealerChannel = new DealerChannel();
+        oldDealerChannel.setDealerId(dealerId);
+        List<DealerChannel> dealerChannelList =   dealerChannelMapper.getDealerChannelList(oldDealerChannel);
+        for (DealerChannel dcOld:dealerChannelList) {
+            dealerChannelStoreMapper.deleteByDealChannelId(dcOld.getDealChannelId());
+        }
+        //删除渠道信息
+        flag = dealerChannelMapper.deleteByDealerId(dealerId);
+        if(flag < 1){
+            throw new RuntimeException("删除渠道信息失败");
+        }
+
+        //删除供应产品关联渠道表
+        dealerProductStoreMapper.deleteByDealerId(dealerId);
+
+        //删除供应产品
+        dealerProductMapper.deleteByDealerId(dealerId);
+
+        //删除合作协议
+        cooperationAgreeMapper.deleteByDealerId(dealerId);
+
+        return flag;
+    }
+
 }

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

@@ -29,6 +29,12 @@ public interface DealerProductStoreMapper {
      */
     Integer  deleteByDealProdId(Integer  id);
     /**
+     * 删除数据 ByDealerId
+     * @param  id
+     * @return Integer
+     */
+    Integer  deleteByDealerId(Integer  id);
+    /**
      * 增加数据 <集合>
      * @param  dealerProductStoreList
      * @return Integer

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

@@ -46,5 +46,11 @@ public interface DmDealerMapper {
      * @return Integer
      */
     Integer  update(DmDealer  dmDealer);
+    /**
+     * 修改数据
+     * @param  dmDealer
+     * @return Integer
+     */
+    Integer  deleteDealer(Integer  id);
 
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dealerProductStoreMapper.xml

@@ -45,6 +45,15 @@
         tb_rst_dm_dealer_product_store
         where deal_prod_id = #{dealProdId}
     </delete>
+    <delete id="deleteByDealerId" parameterType="Integer" >
+        delete FROM
+          tb_rst_dm_dealer_product_store
+        where deal_prod_id in (
+            SELECT deal_prod_id
+            FROM tb_rst_dm_dealer_product
+            WHERE dealer_id = #{dealerId}
+        )
+    </delete>
     <insert id="saveList" parameterType="java.util.List" >
         insert into
           tb_rst_dm_dealer_product_store

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dmDealerMapper.xml

@@ -209,4 +209,10 @@
         where dealer_id= #{dealerId}
     </update>
 
+    <delete id="deleteDealer" parameterType="Integer" >
+        delete FROM
+          tb_rst_dm_dealer
+        where dealer_id = #{dealerId}
+    </delete>
+
 </mapper>

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

@@ -489,4 +489,34 @@ public class DmDealerController {
         }
     }
 
+
+    /**
+     * 删除
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("dm:dealer:delete")
+    @RequestMapping("/delete_dealer")
+    public ResponseJson deleteDealer(HttpServletRequest request,Integer dealerId) {
+        ResponseJson rj = ResponseJson.getSUCCESS();
+
+        Admin admin = AdminUtils.getLoginAdmin();
+        if(admin.getAdminDept() != 1){
+            rj.setResultMsg("对不起，你没有权限！");
+            return rj;
+        }
+
+        Integer flag = 0;
+        flag = dmDealerService.deleteDealer(dealerId);
+
+        if(flag > 0){
+            rj.setResultMsg("删除成功");
+            return rj;
+        }else{
+            rj = ResponseJson.getFAILURE();
+            return  rj;
+        }
+    }
+
 }

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

@@ -489,6 +489,25 @@ public class FinanciaReceController {
         rj.addResponseKeyValue("storeInfoList", storeInfoList);
         return rj;
     }
+    /**
+     * 删除收款
+     * @param request
+     * @param frId
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("dm:financialReceipt:delete")
+    @RequestMapping(value = "/delete_fr")
+    public ResponseJson deleteFr(HttpServletRequest request, Integer frId) {
+        Integer flag = financialReceiptService.delete(frId);
+        if(flag > 0){
+            ResponseJson rj = ResponseJson.getSUCCESS();
+            return rj;
+        }else{
+            ResponseJson rj = ResponseJson.getFAILURE();
+            return rj;
+        }
+    }
 
     /**
      * 获取邮费列表

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

@@ -136,6 +136,12 @@
                                     </a>
                                 </#if>
 
+                                <#if  admin.adminDept == 1>
+                                    <a style="text-decoration:none;display: none" href="javascript:void(0);" title="删除"  onclick="deleteDealer(${dmDealer.dealerId!''});">
+                                        <font color=#06c>删除</font>
+                                    </a>
+                                </#if>
+
                                 <#--
                                 &nbsp;
                                 <a style="text-decoration:none" href="javascript:void(0);" title="修改" onclick="toUpdateQuestion(${dmDealer.dealerId!''})">
@@ -206,6 +212,31 @@
         });
     }
 
+    /**
+     * 删除
+     * @param questionId
+     * @param state
+     */
+    function deleteDealer(dealerId) {
+        $.ajax({
+            type: "POST",
+            data: {
+                "dealerId" :dealerId
+            },
+            url: "${path}/admin/dealer/delete_dealer",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    location.replace(location.href);
+                }else{
+                    layer.msg("删除失败！", {icon: 5, time: 3000});
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+    }
+
 </script>
 
 </body>

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/fr_list.ftl

@@ -153,11 +153,13 @@
                                     </a>
                                 </#if>
 
-                               <#if financialReceipt.frClaimStatus == 2>
-                                   <a style="text-decoration:none" href="javascript:void(0);" title="删除" onclick="toUpdateDealer(${financialReceipt.frId!''})">
+                               <#if financialReceipt.frClaimStatus == 2 && admin.adminDept == 1>
+                                   <a style="text-decoration:none;" href="javascript:void(0);" title="删除" onclick="deleteFr(${financialReceipt.frId!''})">
                                        <font color=#06c>删除</font>
                                    </a>
                                </#if>
+
+
                             </td>
                         </tr>
                     </#list>
@@ -233,11 +235,31 @@
                 }
             });
     }
-
+    /**
+     * 取消认款
+     */
+    function deleteFr(frId){
+            $.ajax({
+                type: "POST",
+                data: {
+                    "frId" :frId
+                },
+                url: "${path}/admin/financial_receipt/delete_fr",
+                async: false,
+                success: function(data){
+                    if (data.returnCode == 200) {
+                        location.replace(location.href);
+                    }else{
+                        layer.msg("删除失败！", {icon: 5, time: 3000});
+                    }
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                }
+            });
+    }
 
 
    /*
-
     /!**
      * 禁用
      * @param questionId