邮费转账

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/PostageService.java

@@ -40,5 +40,12 @@ public interface PostageService {
      */
     Postage getPostage(Integer postageId);
 
+    /**
+     *  删除邮费转账
+     * @param postageId
+     * @return
+     */
+    Integer delPostage(Integer postageId);
+
 
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/PostageServiceImpl.java

@@ -38,4 +38,9 @@ public class PostageServiceImpl implements PostageService {
     public Postage getPostage(Integer postageId) {
         return postageMapper.getPostage(postageId);
     }
+
+    @Override
+    public Integer delPostage(Integer postageId) {
+        return postageMapper.delPostage(postageId);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/PostageMapper.java

@@ -35,4 +35,11 @@ public interface PostageMapper {
      * @return
      */
     Postage getPostage(Integer postageId);
+
+    /**
+     *  删除邮费转账
+     * @param postageId
+     * @return
+     */
+    Integer delPostage(Integer postageId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/postageMapper.xml

@@ -170,4 +170,11 @@
     where postage_id = #{postageId,jdbcType=INTEGER}
   </update>
 
+  <delete id="delPostage" parameterType="java.lang.Integer" >
+    delete from tb_rst_postage
+    <where>
+      postage_id = #{postageId}
+    </where>
+  </delete>
+
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminPostageController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -62,9 +63,9 @@ public class AdminPostageController {
         admin.setAdminStatus(1);
         List<Admin> adminList = sysService.listSelectAdmin(admin);
 
-        int operationPermissions = getAdminDept();      //0=无任何权限 1=客服  2=客服经理 3=财务经理 4=财务打款
+        List<String> operation = getAdminDept();      //1=客服  2=客服经理 3=财务经理 4=财务打款
 
-        mv.addObject("operationPermissions", operationPermissions);
+        mv.addObject("operation", operation);
         mv.addObject("adminList", adminList);
         StitchAttrUtil.setModelAndView(postage, mv, "/admin/postage/postage_list", pagedResult);
         return mv;
@@ -74,80 +75,109 @@ public class AdminPostageController {
      * 获取登录用户的权限
      * @return
      */
-    private Integer getAdminDept(){
+    private List<String> getAdminDept(){
         //获取登录人id
         Admin loginAdmin = AdminUtils.getLoginAdmin();
         //判断当前登录人权限
-        int operationPermissions = 0;   //0=无任何权限 1=客服  2=客服经理 3=财务经理 4=财务打款
-
+        List<String> operation = sysService.listPermissionShiro(loginAdmin.getAdminId());
+        return operation;
+    }
 
 
-        if(loginAdmin.getAdminDept() == 3){
-            operationPermissions = 1;
-            if(loginAdmin.getAdminManager() == 2){
-                operationPermissions = 2;
+    /**
+     * 客服确认状态
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("postage:update:confirm")
+    @RequestMapping(value = "/updateConfirmPostage")
+    public ResponseJson updateConfirmPostage(HttpServletRequest request, Integer postageId,Integer status) throws Exception {
+        if(postageId == null || postageId == 0){
+            return new ResponseJson(500, "未获取到记录id", 500);
+        }
+        if( status == null || status == 0){
+            return new ResponseJson(500, "修改失败，请重试", 500);
+        }
+        Postage post = postageService.getPostage(postageId);
+        Postage postage = new Postage();
+        postage.setPostageId(postageId);
+        //判断修改类型 1=客服修改申请状态 2=客服经理修改审核状态 3=财务经理修改审核转账状态
+        Integer num = 0;
+        if(post.getPostageCustomerStatus() == 1){
+            if(status == 2){
+                postage.setPostageCustomerStatus(status);   //申请中，
+                postage.setPostageManagerStatus(1);     //审核中
             }
-        }else if(loginAdmin.getAdminDept() == 5){
-            operationPermissions = 3;
-        }else if(loginAdmin.getAdminDept() == 1){
-            operationPermissions = 4;
+            num = postageService.updatePostage(postage);
         }
-        return operationPermissions;
-    }
 
+        if(num > 0){
+            return new ResponseJson(200, "修改成功", 200);
+        }else{
+            return new ResponseJson(500, "修改失败", 500);
+        }
+    }
 
     /**
-     * 客服确认状态
+     * 客服经理审核
      * @return
      */
     @ResponseBody
-    @RequiresPermissions("postage:update:postage")
-    @RequestMapping(value = "/update_postage_status")
-    public ResponseJson updatePostageStatus(HttpServletRequest request, Integer postageId,Integer status,Integer type) throws Exception {
+    @RequiresPermissions("postage:customer:review")
+    @RequestMapping(value = "/updateCustomerReview")
+    public ResponseJson updatePostageStatus(HttpServletRequest request, Integer postageId,Integer status) throws Exception {
         if(postageId == null || postageId == 0){
             return new ResponseJson(500, "未获取到记录id", 500);
         }
-        if(type == null || type == 0 || status == null || status == 0){
+        if(status == null || status == 0){
             return new ResponseJson(500, "修改失败，请重试", 500);
         }
-
         Postage post = postageService.getPostage(postageId);
+        Integer num = 0;
+        if(post.getPostageManagerStatus() == 1){          //审核中
+            Postage postage = new Postage();
+            postage.setPostageId(postageId);
+            if(status == 2){    //状态（客服经理审核）1：审核中 2：通过  3：驳回
+                postage.setPostageManagerStatus(status);
+                postage.setPostageFinanceStatus(1);     //审核中
+            }else{
+                postage.setPostageManagerStatus(status);    //驳回
+            }
+            num = postageService.updatePostage(postage);
+        }
 
-        int operationPermissions = getAdminDept();      //0=无任何权限 1=客服  2=客服经理 3=财务经理 4=超级管理员
+        if(num > 0){
+            return new ResponseJson(200, "修改成功", 200);
+        }else{
+            return new ResponseJson(500, "修改失败", 500);
+        }
+    }
 
-        Postage postage = new Postage();
-        postage.setPostageId(postageId);
-        //判断修改类型 1=客服修改申请状态 2=客服经理修改审核状态 3=财务经理修改审核转账状态
+    /**
+     * 财务经理审核
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("postage:finance:review")
+    @RequestMapping(value = "/updateFinanceReview")
+    public ResponseJson updateFinanceReview(HttpServletRequest request, Integer postageId,Integer status) throws Exception {
+        if(postageId == null || postageId == 0){
+            return new ResponseJson(500, "未获取到记录id", 500);
+        }
+        if(status == null || status == 0){
+            return new ResponseJson(500, "修改失败，请重试", 500);
+        }
+        Postage post = postageService.getPostage(postageId);
         Integer num = 0;
-        switch (type){
-            case 1:
-                if(post.getPostageCustomerStatus() == 1 && (operationPermissions == 1 || operationPermissions ==2 || operationPermissions ==4)){
-                    if(status == 2){
-                        postage.setPostageCustomerStatus(status);   //申请中，
-                        postage.setPostageManagerStatus(1);     //审核中
-                    }
-                    num = postageService.updatePostage(postage);
-                }
-                break;
-            case 2:
-                if(post.getPostageManagerStatus() == 1 && (operationPermissions ==2 || operationPermissions ==4)){
-                    if(status == 2){    //状态（客服经理审核）1：审核中 2：通过  3：驳回
-                        postage.setPostageManagerStatus(status);
-                        postage.setPostageFinanceStatus(1);     //审核中
-                    }else{
-                        postage.setPostageManagerStatus(status);    //驳回
-                    }
-                    num = postageService.updatePostage(postage);
-                }
-                break;
-            case 3:
-                if((post.getPostageFinanceStatus() == 1 ||post.getPostageFinanceStatus() == 2) && (operationPermissions ==3 || operationPermissions ==4)){
-                    //状态（财务审核） 1：审核中 2：通过（已申请待转账）  3：驳回  4:已转账
-                    postage.setPostageFinanceStatus(status);
-                    num = postageService.updatePostage(postage);
-                }
-                break;
+
+        if((post.getPostageFinanceStatus() == 1) ){
+            Postage postage = new Postage();
+            postage.setPostageId(postageId);
+            //状态（财务审核） 1：审核中 2：通过（已申请待转账）  3：驳回  4:已转账
+            postage.setPostageFinanceStatus(status);
+            num = postageService.updatePostage(postage);
         }
+
         if(num > 0){
             return new ResponseJson(200, "修改成功", 200);
         }else{
@@ -156,10 +186,58 @@ public class AdminPostageController {
     }
 
 
-//
+    /**
+     * 财务经理打款
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("postage:finance:money")
+    @RequestMapping(value = "/updateFinanceMoney")
+    public ResponseJson updateFinanceMoney(HttpServletRequest request, Integer postageId,Integer status) throws Exception {
+        if(postageId == null || postageId == 0){
+            return new ResponseJson(500, "未获取到记录id", 500);
+        }
+        if(status == null || status == 0){
+            return new ResponseJson(500, "修改失败，请重试", 500);
+        }
+        Postage post = postageService.getPostage(postageId);
+        Integer num = 0;
+
+        if((post.getPostageFinanceStatus() == 2) ){
+            Postage postage = new Postage();
+            postage.setPostageId(postageId);
+            //状态（财务审核） 1：审核中 2：通过（已申请待转账）  3：驳回  4:已转账
+            postage.setPostageFinanceStatus(status);
+            num = postageService.updatePostage(postage);
+        }
+
+        if(num > 0){
+            return new ResponseJson(200, "修改成功", 200);
+        }else{
+            return new ResponseJson(500, "修改失败", 500);
+        }
+    }
+
+    /**
+     * 删除
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("postage:del:postage")
+    @RequestMapping(value = "/delPostage")
+    public ResponseJson delPostage(HttpServletRequest request, Integer postageId) throws Exception {
+        if(postageId == null || postageId == 0){
+            return new ResponseJson(500, "未获取到记录id", 500);
+        }
+        Integer num = 0;
+        num = postageService.delPostage(postageId);
 
-//    postage:update:manager
+        if(num > 0){
+            return new ResponseJson(200, "修改成功", 200);
+        }else{
+            return new ResponseJson(500, "修改失败", 500);
+        }
+    }
 
-//    postage:update:finance
 }
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/postage/postage_list.ftl

@@ -155,33 +155,47 @@
                     <td>${postage.postageAlipay!''}</td>
                     <td>${postage.postageAlipayName!''}</td>
                     <td>
-                        <#if operationPermissions == 0>
-                            -
-                        <#elseif (operationPermissions == 1 || operationPermissions == 4) && postage.postageCustomerStatus == 1>
-                            <a style="text-decoration:none" href="javascript:;" title="确认申请" onclick="updatePostage(${postage.postageId},2,1);">
-                                <i class="Hui-iconfont">&#xe6a7;</i>
-                            </a>
-                        <#elseif (operationPermissions == 2 || operationPermissions == 4)  &&  postage.postageManagerStatus?? && postage.postageManagerStatus == 1>
-                            <a style="text-decoration:none" href="javascript:;" title="审核通过" onclick="updatePostage(${postage.postageId},2,2);">
-                                <i class="Hui-iconfont">&#xe6e1;</i>
-                            </a>
-                            <a style="text-decoration:none" href="javascript:;" title="审核不通过" onclick="updatePostage(${postage.postageId},3,2);">
-                                <i class="Hui-iconfont">&#xe6dd;</i>
-                            </a>
-                        <#elseif (operationPermissions == 3 || operationPermissions == 4)>
-                            <#if postage.postageFinanceStatus?? && postage.postageFinanceStatus == 1>
-                                <a style="text-decoration:none" href="javascript:;" title="审核通过" onclick="updatePostage(${postage.postageId},2,3);">
-                                    <i class="Hui-iconfont">&#xe6e1;</i>
-                                </a>
-                                <a style="text-decoration:none" href="javascript:;" title="审核不通过" onclick="updatePostage(${postage.postageId},2,3);">
-                                    <i class="Hui-iconfont">&#xe6dd;</i>
-                                </a>
-                            </#if>
-                            <#if postage.postageFinanceStatus?? && postage.postageFinanceStatus == 2>
-                                <a style="text-decoration:none" href="javascript:;" title="已转账" onclick="updatePostage(${postage.postageId},4,3);">
-                                    <i class="iconfont icon-zhuanzhang"></i>
-                                </a>
-                            </#if>
+                        <#if postage.postageCustomerStatus == 1>
+                            <#list operation as open>
+                                <#if open == "postage:update:confirm">
+                                    <a style="text-decoration:none" href="javascript:;" title="确认申请" onclick="updatePostage(${postage.postageId},2,1);">
+                                        <i class="Hui-iconfont">&#xe6a7;</i>
+                                    </a>
+                                </#if>
+                            </#list>
+                         </#if>
+                        <#if postage.postageManagerStatus?? && postage.postageManagerStatus == 1>
+                            <#list operation as open>
+                                <#if open == "postage:customer:review">
+                                    <a style="text-decoration:none" href="javascript:;" title="审核通过" onclick="updatePostage(${postage.postageId},2,2);">
+                                        <i class="iconfont icon-pass-2-copy"></i>
+                                    </a>
+                                    <a style="text-decoration:none" href="javascript:;" title="审核不通过" onclick="updatePostage(${postage.postageId},3,2);">
+                                        <i class="iconfont icon-bohui"></i>
+                                    </a>
+                                </#if>
+                            </#list>
+                        </#if>
+                        <#if postage.postageFinanceStatus?? && postage.postageFinanceStatus == 1>
+                            <#list operation as open>
+                                <#if open == "postage:finance:review">
+                                    <a style="text-decoration:none" href="javascript:;" title="审核通过" onclick="updatePostage(${postage.postageId},2,3);">
+                                        <i class="iconfont icon-pass-2-copy"></i>
+                                    </a>
+                                    <a style="text-decoration:none" href="javascript:;" title="审核不通过" onclick="updatePostage(${postage.postageId},2,3);">
+                                        <i class="iconfont icon-bohui"></i>
+                                    </a>
+                                </#if>
+                            </#list>
+                        </#if>
+                        <#if postage.postageFinanceStatus?? && postage.postageFinanceStatus == 2>
+                            <#list operation as open>
+                                <#if open == "postage:finance:review">
+                                    <a style="text-decoration:none" href="javascript:;" title="已转账" onclick="updatePostage(${postage.postageId},4,4);">
+                                        <i class="iconfont icon-zhuanzhang"></i>
+                                    </a>
+                                </#if>
+                            </#list>
                         </#if>
                     </td>
                 </tr>
@@ -201,12 +215,22 @@
      * 修改状态
      */
     function updatePostage(postageId,status,type) {
+        var url = "";
+        if(type == 1){
+            url = '/admin/postage/updateConfirmPostage';   //客服确认
+        }else if(type == 2){
+            url = '/admin/postage/updateCustomerReview';   //客服经理审核
+        }else if(type == 3){
+            url = '/admin/postage/updateFinanceReview';   //财务审核
+        }else if(type == 4){
+            url = '/admin/postage/updateFinanceMoney';   //财务打款
+        }
         layer.confirm('确认要修改吗？',function(index){
             $.ajax({
                 cache: true,
                 type: "POST",
-                data: {"postageId":postageId,"status" : status,"type" : type},
-                url: "${path}/admin/postage/update_postage_status",
+                data: {"postageId":postageId,"status" : status},
+                url: "${path}" + url,
                 async: false,
                 success: function(data){
                     if (data.returnCode == 200) {