邮费装转账

watero-rst-core/src/main/java/com.iamberry.rst.core/sys/Admin.java

@@ -22,7 +22,7 @@ public class Admin implements Serializable {
 
     private Integer adminId;
 
-    private Integer adminDept;              // 1:技术组 2:销售组 3:客服组 4:运营组 5:其他
+    private Integer adminDept;              // 1:技术组 2:销售组(深圳销售部) 3:客服组(客服运营部) 4:运营组（广州销售部） 5:其他（财务部） 6工厂生产部
 
     @NotBlank(message="姓名不能为空")
     @Length(min=2,max=10,message="姓名必须由2~10个字组成")

watero-rst-core/src/main/java/com.iamberry.rst.core/sys/Dept.java

@@ -21,6 +21,7 @@ public class Dept {
         depts.put(3, new DeptInfo(3, "客服运营部", "CS-RUN"));
         depts.put(4, new DeptInfo(4, "广州销售部", "SALVE"));
         depts.put(5, new DeptInfo(5, "财务部", "FINANCE"));
+        depts.put(5, new DeptInfo(6, "工厂生产部", "FINANCE"));
     }
 
     /**

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

@@ -32,4 +32,13 @@ public interface PostageService {
      */
     PagedResult<Postage> listPostage(int pageNO, int pageSize, Postage postage, boolean isTotalNum);
 
+
+    /**
+     *  获取邮费详情
+     * @param postageId
+     * @return
+     */
+    Postage getPostage(Integer postageId);
+
+
 }

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

@@ -33,4 +33,9 @@ public class PostageServiceImpl implements PostageService {
         List<Postage> postageList = postageMapper.listPostage(postage);
         return PageUtil.getPage(postageList);
     }
+
+    @Override
+    public Postage getPostage(Integer postageId) {
+        return postageMapper.getPostage(postageId);
+    }
 }

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

@@ -28,4 +28,11 @@ public interface PostageMapper {
      * @return
      */
     List<Postage> listPostage(Postage postage);
+
+    /**
+     *  获取邮费详情
+     * @param postageId
+     * @return
+     */
+    Postage getPostage(Integer postageId);
 }

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

@@ -82,6 +82,17 @@
     </where>
   </select>
 
+  <select id="getPostage" resultMap="BaseResultMap" parameterType="Postage" >
+    select
+    <include refid="Base_Column_List" />,
+    sa.admin_name AS adminName,
+    si.store_name AS storeName
+    from tb_rst_postage p
+    LEFT JOIN tb_rst_sys_admin sa ON p.admin_id = sa.admin_id
+    LEFT JOIN tb_rst_store_info si ON p.postage_order_source = si.store_id
+   WHERE  p.postage_id = #{postageId}
+  </select>
+
     <insert id="savePostage" parameterType="Postage" >
     insert into tb_rst_postage (postage_id, admin_id, postage_customer_status,
     postage_manager_status, postage_finance_status,

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

@@ -131,6 +131,14 @@ public class AdminCustomerReportController {
         customerInfo.setStartTime(startDate);
         customerInfo.setEndTime(endDate);
 
+        Date customerEndTime = customerInfo.getEndTime();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(customerEndTime);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        customerInfo.setEndTime(calendar.getTime());
+
         List dataList = new ArrayList<>();
         List nameList = new ArrayList<>();
         String name = "";

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

@@ -61,24 +61,35 @@ public class AdminPostageController {
         Admin admin = new Admin();
         admin.setAdminStatus(1);
         List<Admin> adminList = sysService.listSelectAdmin(admin);
+
+        int operationPermissions = getAdminDept();      //0=无任何权限 1=客服  2=客服经理 3=财务经理 4=超级管理员
+
+        mv.addObject("operationPermissions", operationPermissions);
+        mv.addObject("adminList", adminList);
+        StitchAttrUtil.setModelAndView(postage, mv, "/admin/postage/postage_list", pagedResult);
+        return mv;
+    }
+
+    /**
+     * 获取登录用户的权限
+     * @return
+     */
+    private Integer getAdminDept(){
         //获取登录人id
         Admin loginAdmin = AdminUtils.getLoginAdmin();
         //判断当前登录人权限
-        int operationPermissions = 0;//0=无任何权限 1=客服  2=客服经理 3=财务经理 4=超级管理员
+        int operationPermissions = 0;//0=无任何权限 1=客服  2=客服经理 3=财务经理 4=超级管理员  5=财务打款
         if(loginAdmin.getAdminDept() == 3){
             operationPermissions = 1;
             if(loginAdmin.getAdminManager() == 2){
                 operationPermissions = 2;
             }
-        }else if(loginAdmin.getAdminDept() == 4 && loginAdmin.getAdminManager() == 2){
+        }else if(loginAdmin.getAdminDept() == 5){
             operationPermissions = 3;
-        }else if(loginAdmin.getAdminDept() == 1 && loginAdmin.getAdminManager() == 2){
+        }else if(loginAdmin.getAdminDept() == 1){
             operationPermissions = 4;
         }
-        mv.addObject("operationPermissions", operationPermissions);
-        mv.addObject("adminList", adminList);
-        StitchAttrUtil.setModelAndView(postage, mv, "/admin/postage/postage_list", pagedResult);
-        return mv;
+        return operationPermissions;
     }
 
 
@@ -93,27 +104,47 @@ public class AdminPostageController {
         if(postageId == null || postageId == 0){
             return new ResponseJson(500, "未获取到记录id", 500);
         }
-        if(type == null || type == 0){
-            return new ResponseJson(500, "修改失败。请刷新重试", 500);
-        }
-        if(status == null || status == 0){
-            return new ResponseJson(500, "修改失败。请刷新重试", 500);
+        if(type == null || type == 0 || status == null || status == 0){
+            return new ResponseJson(500, "修改失败，请重试", 500);
         }
+
+        Postage post = postageService.getPostage(postageId);
+
+        int operationPermissions = getAdminDept();      //0=无任何权限 1=客服  2=客服经理 3=财务经理 4=超级管理员
+
         Postage postage = new Postage();
         postage.setPostageId(postageId);
-        //判断修改类型 1=客服修改申请状态 2=客服经理修改审核状态 3=财务经理修改转账状态
+        //判断修改类型 1=客服修改申请状态 2=客服经理修改审核状态 3=财务经理修改审核转账状态
+        Integer num = 0;
         switch (type){
             case 1:
-                postage.setPostageCustomerStatus(status);
-             break;
+                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:
-                postage.setPostageManagerStatus(status);
+                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:
-                postage.setPostageFinanceStatus(status);
+                if((post.getPostageFinanceStatus() == 1 ||post.getPostageFinanceStatus() == 2) && (operationPermissions ==3 || operationPermissions ==4)){
+                    //状态（财务审核） 1：审核中 2：通过（已申请待转账）  3：驳回  4:已转账
+                    postage.setPostageFinanceStatus(status);
+                    num = postageService.updatePostage(postage);
+                }
                 break;
         }
-        Integer num = postageService.updatePostage(postage);
         if(num > 0){
             return new ResponseJson(200, "修改成功", 200);
         }else{

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -451,4 +451,6 @@ public class MQTask implements InitializingBean {
 			}
 		}
 	}
+
+
 }

watero-rst-web/src/main/webapp/WEB-INF/views/base/add_base.ftl

@@ -12,6 +12,7 @@
 <link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/skin/default/skin.css" id="skin" />
 <link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/css/style.css" />
 <link rel="stylesheet" type="text/css" href="${path}/common/lib/Validform/Validform.css" />
+<link rel="stylesheet" type="text/css" href="${path}/common/css/iconfont/iconfont.css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="${path}/common/lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>

watero-rst-web/src/main/webapp/WEB-INF/views/base/list_base.ftl

@@ -11,6 +11,8 @@
 <link rel="stylesheet" type="text/css" href="${path}/common/lib/Hui-iconfont/1.0.8/iconfont.css" />
 <link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/skin/default/skin.css" id="skin" />
 <link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/css/style.css" />
+
+<link rel="stylesheet" type="text/css" href="${path}/common/css/iconfont/iconfont.css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="${path}/common/lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>

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

@@ -97,6 +97,7 @@
                                     <option value="dbkd">德邦快递</option>
                                     <option value="01">其他</option>
                                     <option value="02">上门送货</option>
+                                    <option value="lianhaowuliu">联昊通</option>
                                 </select>
                             </span>
                         </div>
@@ -145,17 +146,21 @@
                         <input type="radio" id="tel-6" name="backGoodsIsTransfer" value="0" seleType="postage">
                         <label for="tel-6">不需要转账</label>
                     </div>
+                    <#--<div class="radio-box">-->
+                        <#--<input type="radio" id="tel-7" name="backGoodsIsTransfer" value="1" seleType="postage">-->
+                        <#--<label for="tel-7">已转账</label>-->
+                    <#--</div>-->
+                    <#--<div class="radio-box">-->
+                        <#--<input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2" seleType="postage">-->
+                        <#--<label for="tel-8">已申请待转账</label>-->
+                    <#--</div>-->
+                    <#--<div class="radio-box">-->
+                        <#--<input type="radio" id="tel-9" name="backGoodsIsTransfer" value="3" seleType="postage">-->
+                        <#--<label for="tel-9">未申请</label>-->
+                    <#--</div>-->
                     <div class="radio-box">
-                        <input type="radio" id="tel-7" name="backGoodsIsTransfer" value="1" seleType="postage">
-                        <label for="tel-7">已转账</label>
-                    </div>
-                    <div class="radio-box">
-                        <input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2" seleType="postage">
-                        <label for="tel-8">已申请待转账</label>
-                    </div>
-                    <div class="radio-box">
-                        <input type="radio" id="tel-9" name="backGoodsIsTransfer" value="3" seleType="postage">
-                        <label for="tel-9">未申请</label>
+                        <input type="radio" id="tel-9" name="backGoodsIsTransfer" value="10" seleType="postage">
+                        <label for="tel-9">需要转账</label>
                     </div>
                 </div>
             </div>

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

@@ -89,6 +89,7 @@
                                     <option value="jd">京东快递</option>
                                     <option value="dbkd">德邦快递</option>
                                     <option value="02">上门送货</option>
+                                    <option value="lianhaowuliu">联昊通</option>
                                 </select>
                             </span>
                         </div>

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

@@ -139,6 +139,7 @@
                     <option value="jd">京东快递</option>
                     <option value="dbkd">德邦快递</option>
                     <option value="02">上门送货</option>
+                    <option value="lianhaowuliu">联昊通</option>
 				</select>
 			</span>
                 </div>

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

@@ -104,6 +104,7 @@
                                     <option value="jd">京东快递</option>
                                     <option value="dbkd">德邦快递</option>
                                     <option value="02">上门送货</option>
+                                    <option value="lianhaowuliu">联昊通</option>
                                 </select>
                         </span>
                     </div>
@@ -295,6 +296,7 @@
                     <option value="jd">京东快递</option>
                     <option value="dbkd">德邦快递</option>
                     <option value="02">上门送货</option>
+                    <option value="lianhaowuliu">联昊通</option>
 				</select>
 			</span>
                         </div>

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

@@ -106,6 +106,7 @@
                                     <option value="jd">京东快递</option>
                                     <option value="dbkd">德邦快递</option>
                                     <option value="02">上门送货</option>
+                                    <option value="lianhaowuliu">联昊通</option>
                                 </select>
                             </span>
                         </div>
@@ -296,6 +297,7 @@
                     <option value="jd">京东快递</option>
                     <option value="dbkd">德邦快递</option>
                     <option value="02">上门送货</option>
+                    <option value="lianhaowuliu">联昊通</option>
 				</select>
 			</span>
                             </div>

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

@@ -37,7 +37,7 @@
 <div class="page-container">
     <div class="text-c">
         <form action="${path}/admin/postage/postage_list" method="post">
-            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${postage.salesOrderId!}" placeholder="efast订单号" id="salesOrderId" name="salesOrderId">
+            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${postage.salesOrderId!}" placeholder="百胜订单号" id="salesOrderId" name="salesOrderId">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${postage.postageClientName!}" placeholder="请输入姓名" id="postageClientName" name="postageClientName">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${postage.postageClientTel!}" placeholder="请输入电话号码" id="postageClientTel" name="postageClientTel">
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;height: 35px; id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
@@ -88,21 +88,25 @@
                                     <#elseif postage.postageManagerStatus == 3>
                                         驳回
                                     </#if>
+                                <#else>
+                                    -
                                 </#if>
                             </td>
                             <td>
-                            <#if postage.postageFinanceStatus??>
-                                    <#if postage.postageFinanceStatus == 1>
-                                        审核中
-                                    <#elseif postage.postageFinanceStatus == 2>
-                                        通过（已申请待转账）
-                                    <#elseif postage.postageFinanceStatus == 3>
-                                        驳回
-                                    <#elseif postage.postageFinanceStatus == 4>
-                                        已转账
-                                    </#if>
-                            </#if>
-                        </td>
+                                <#if postage.postageFinanceStatus??>
+                                        <#if postage.postageFinanceStatus == 1>
+                                            审核中
+                                        <#elseif postage.postageFinanceStatus == 2>
+                                            通过（已申请待转账）
+                                        <#elseif postage.postageFinanceStatus == 3>
+                                            驳回
+                                        <#elseif postage.postageFinanceStatus == 4>
+                                            已转账
+                                        </#if>
+                                <#else>
+                                    -
+                                </#if>
+                            </td>
                             <td>${postage.storeName!''}</td>
                             <td>
                                 <#if postage.postageTreatmentMethod == 3>
@@ -150,7 +154,36 @@
                             <td>${postage.postageAmount!''}</td>
                             <td>${postage.postageAlipay!''}</td>
                             <td>${postage.postageAlipayName!''}</td>
-                            <td></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>
+                            </td>
                         </tr>
                     </#list>
             <#else>
@@ -164,12 +197,10 @@
 <#include "/base/page_util.ftl">
 </tfoot>
 <script type="text/javascript">
-
-
     /**
-     * 修改申请状态
+     * 修改状态
      */
-    function updateCustomerStatus(postageId,status,type) {
+    function updatePostage(postageId,status,type) {
         layer.confirm('确认要修改吗？',function(index){
             $.ajax({
                 cache: true,

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -228,12 +228,6 @@
         });
     }
 
-    /*超时控制器*/
-    var timeout=setTimeout(function(){
-        layer.msg('连接超时，请重试!',{icon: 5,time:3000});
-        },100000
-    );
-
     // 提交
     function sub() {
         var map = $(".productmap:checked");                 // 第三方平台的产品信息和Efast的产品信息管理数据 id-name
@@ -300,6 +294,12 @@
             }
         }
 
+        /*超时控制器*/
+        var timeout=setTimeout(function(){
+                    layer.msg('连接超时，请重试!',{icon: 5,time:3000});
+                },100000
+        );
+
         // 对应好Excel和系统需要的数据以后，准备推送Efast
         $.post(root_path + "/admin/order/toobj_sendefast",{
                 "filePath":$("#productUrl").val(),