邮费处理

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/BackGoods.java

@@ -45,7 +45,9 @@ public class BackGoods  implements Serializable {
 
     private String backGoodsAlipayName;             //转账账户姓名
 
-    private Integer backGoodsIsTransfer;        //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请
+    //20180327 当前邮费默认为  0 不需要
+    //是否已转账邮费  0:不需要 10:需要转账
+    private Integer backGoodsIsTransfer;        //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请 -- 作废
 
     private Date backGoodsCreateTime;
 

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerCommon.java

@@ -66,8 +66,10 @@ public class CustomerCommon implements Serializable {
     private String relationAlipay;
     //转账账户 (账户姓名)
     private String relationAlipayName;
-    //是否已转账邮费  0:不需要 1:已转  2:已申请待转账   3:未申请
-    private Integer relationIsTransfer;
+
+    //20180327 当前邮费默认为  0 不需要
+    //是否已转账邮费  0:不需要 10:需要转账
+    private Integer relationIsTransfer;  //是否已转账邮费  0:不需要 1:已转  2:已申请待转账   3:未申请  -- 作废
     //创建时间
     private Date relationCreateTime;
     // 修改时间,

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/NoreasonBack.java

@@ -44,7 +44,9 @@ public class NoreasonBack  implements Serializable {
     private String noreasonBackAlipay;          //转账账户
     private String noreasonBackAlipayName;          //转账账户姓名
 
-    private Integer noreasonBackIsTransfer;     //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请
+    //20180327 当前邮费默认为  0 不需要
+    //是否已转账邮费  0:不需要 10:需要转账
+    private Integer noreasonBackIsTransfer;     //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请 -- 作废
 
     private Date noreasonBackCreateTime;
 

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Renewed.java

@@ -68,7 +68,8 @@ public class Renewed  implements Serializable {
     private String renewedAlipay;
     //转账账户 (账户姓名)
     private String renewedAlipayName;
-     //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请
+    //20180327 当前邮费默认为  0 不需要
+     //是否已转账邮费  0:不需要 10:需要转账
     private Integer renewedIsTransfer;
      //创建时间 
     private Date renewedCreateTime;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Repair.java

@@ -68,7 +68,8 @@ public class Repair implements Serializable {
     private String repairAlipay;
     //  转账账户 姓名
     private String repairAlipayName;
-    //  是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请
+    //20180327 当前邮费默认为  0 不需要
+    //是否已转账邮费  0:不需要 10:需要转账
     private Integer repairIsTransfer;
     //  创建时间 
     private Date repairCreateTime;

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

@@ -134,7 +134,8 @@ public class CustomerServiceImpl implements CustomerService {
             customerCommon.setOrderId(salesOrder.getSalesId()); //订单id
             customerCommon.setTransactionNumber(customerInfo.getTransactionNumber());   //外部交易号
 
-            customerCommon.setRelationIsTransfer(3);    //是否已转账邮费  3：未申请
+            // TODO: 2018/3/27 是否转账邮费，默认为不需要转账 ： 0
+            customerCommon.setRelationIsTransfer(0);    //是否已转账邮费
             customerCommon.setRelationBackPostage(0);   //邮费默认为0
 
             customerCommon.setRelationBackName(customerCommon.getRelationSendName()); //姓名

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

@@ -62,7 +62,7 @@
         AND p.sales_orderId = #{salesOrderId}
       </if>
       <if test="postageClientName != null and postageClientName != ''">
-        AND p.postage_client_name = #{postageClientName}
+        AND p.postage_client_name like CONCAT('%',#{postageClientName},'%')
       </if>
       <if test="postageClientTel != null and postageClientTel != ''">
         AND p.postage_client_tel = #{postageClientTel}
@@ -74,12 +74,13 @@
         AND p.postage_logistics_no = #{postageLogisticsNo}
       </if>
       <if test="postageAlipay != null and postageAlipay != ''">
-        AND p.postage_alipay = #{postageAlipay}
+        AND p.postage_alipay like CONCAT('%',#{postageAlipay},'%')
       </if>
       <if test="postageAlipayName != null and postageAlipayName != ''">
-        AND p.postage_alipay_name = #{postageAlipayName}
+        AND p.postage_alipay_name like CONCAT('%',#{postageAlipayName},'%')
       </if>
     </where>
+    ORDER BY postage_id DESC
   </select>
 
   <select id="getPostage" resultMap="BaseResultMap" parameterType="Postage" >

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

@@ -53,7 +53,7 @@ public class AdminPostageController {
                                     @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                     @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
         ModelAndView mv = new ModelAndView("cm/postage/postage_list");
-
+        List<String> operation = getAdminDept();      //1=客服  2=客服经理 3=财务经理 4=财务打款
         PagedResult<Postage> pagedResult = postageService.listPostage(pageNO, pageSize, postage, totalNum == 0);
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
@@ -63,8 +63,6 @@ public class AdminPostageController {
         admin.setAdminStatus(1);
         List<Admin> adminList = sysService.listSelectAdmin(admin);
 
-        List<String> operation = getAdminDept();      //1=客服  2=客服经理 3=财务经理 4=财务打款
-
         mv.addObject("operation", operation);
         mv.addObject("adminList", adminList);
         StitchAttrUtil.setModelAndView(postage, mv, "/admin/postage/postage_list", pagedResult);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminPtsBatchController.java

@@ -47,7 +47,7 @@ public class AdminPtsBatchController {
     @Autowired
     private MachineVersionService machineVersionService;
 
-    private String[] BATCH_COLOR = {"黑色","白色","金色","红色","蓝色","绿色","橙色","黄色","青色","紫色","蔷薇粉","云烟紫","琉璃绿","亚麻灰"};
+    private String[] BATCH_COLOR = {"黑色","白色","金色","红色","蓝色","绿色","橙色","黄色","青色","紫色","粉色","蔷薇粉","云烟紫","琉璃绿","亚麻灰"};
 
     /**
      * 获取batch列表

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

@@ -146,6 +146,10 @@
                         <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-9" name="backGoodsIsTransfer" value="10" 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>-->
@@ -158,10 +162,7 @@
                         <#--<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-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

@@ -132,17 +132,21 @@
                             <label for="tel-6">不需要转账</label>
                         </div>
                         <div class="radio-box">
-                            <input type="radio" id="tel-7" name="noreasonBackIsTransfer" value="1" seleType="postage">
-                            <label for="tel-7">已转账</label>
-                        </div>
-                        <div class="radio-box">
-                            <input type="radio" id="tel-8" name="noreasonBackIsTransfer" value="2" seleType="postage">
-                            <label for="tel-8">已申请待转账</label>
-                        </div>
-                        <div class="radio-box">
-                            <input type="radio" id="tel-9" name="noreasonBackIsTransfer" value="3" seleType="postage">
-                            <label for="tel-9">未申请</label>
+                            <input type="radio" id="tel-6" name="noreasonBackIsTransfer" value="10" seleType="postage">
+                            <label for="tel-6">需要转账</label>
                         </div>
+                        <#--<div class="radio-box">-->
+                            <#--<input type="radio" id="tel-7" name="noreasonBackIsTransfer" value="1" seleType="postage">-->
+                            <#--<label for="tel-7">已转账</label>-->
+                        <#--</div>-->
+                        <#--<div class="radio-box">-->
+                            <#--<input type="radio" id="tel-8" name="noreasonBackIsTransfer" value="2" seleType="postage">-->
+                            <#--<label for="tel-8">已申请待转账</label>-->
+                        <#--</div>-->
+                        <#--<div class="radio-box">-->
+                            <#--<input type="radio" id="tel-9" name="noreasonBackIsTransfer" value="3" seleType="postage">-->
+                            <#--<label for="tel-9">未申请</label>-->
+                        <#--</div>-->
                     </div>
                 </div>
 

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

@@ -148,17 +148,21 @@
                         <label for="tel-6">不需要转账</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-7" name="renewedIsTransfer" value="1" seleType="postage">
-                        <label for="tel-7">已转账</label>
-                    </div>
-                    <div class="radio-box">
-                        <input type="radio" id="tel-8" name="renewedIsTransfer" value="2" seleType="postage">
-                        <label for="tel-8">已申请待转账</label>
-                    </div>
-                    <div class="radio-box">
-                        <input type="radio" id="tel-9" name="renewedIsTransfer" value="3" seleType="postage">
-                        <label for="tel-9">未申请</label>
-                    </div>
+                        <input type="radio" id="tel-6" name="renewedIsTransfer" value="10" seleType="postage">
+                        <label for="tel-6">需要转账</label>
+                    </div>
+                    <#--<div class="radio-box">-->
+                        <#--<input type="radio" id="tel-7" name="renewedIsTransfer" value="1" seleType="postage">-->
+                        <#--<label for="tel-7">已转账</label>-->
+                    <#--</div>-->
+                    <#--<div class="radio-box">-->
+                        <#--<input type="radio" id="tel-8" name="renewedIsTransfer" value="2" seleType="postage">-->
+                        <#--<label for="tel-8">已申请待转账</label>-->
+                    <#--</div>-->
+                    <#--<div class="radio-box">-->
+                        <#--<input type="radio" id="tel-9" name="renewedIsTransfer" value="3" seleType="postage">-->
+                        <#--<label for="tel-9">未申请</label>-->
+                    <#--</div>-->
                 </div>
             </div>
             <div class="row cl" id="postageInformation">

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

@@ -149,17 +149,21 @@
                             <label for="tel-6">不需要转账</label>
                         </div>
                         <div class="radio-box">
-                            <input type="radio" id="tel-7" name="repairIsTransfer" value="1" seleType="postage">
-                            <label for="tel-7">已转账</label>
-                        </div>
-                        <div class="radio-box">
-                            <input type="radio" id="tel-8" name="repairIsTransfer" value="2" seleType="postage">
-                            <label for="tel-8">已申请待转账</label>
-                        </div>
-                        <div class="radio-box">
-                            <input type="radio" id="tel-9" name="repairIsTransfer" value="3" seleType="postage">
-                            <label for="tel-9">未申请</label>
+                            <input type="radio" id="tel-6" name="repairIsTransfer" value="10" seleType="postage">
+                            <label for="tel-6">需要转账</label>
                         </div>
+                        <#--<div class="radio-box">-->
+                            <#--<input type="radio" id="tel-7" name="repairIsTransfer" value="1" seleType="postage">-->
+                            <#--<label for="tel-7">已转账</label>-->
+                        <#--</div>-->
+                        <#--<div class="radio-box">-->
+                            <#--<input type="radio" id="tel-8" name="repairIsTransfer" value="2" seleType="postage">-->
+                            <#--<label for="tel-8">已申请待转账</label>-->
+                        <#--</div>-->
+                        <#--<div class="radio-box">-->
+                            <#--<input type="radio" id="tel-9" name="repairIsTransfer" value="3" seleType="postage">-->
+                            <#--<label for="tel-9">未申请</label>-->
+                        <#--</div>-->
                     </div>
                 </div>
                 <div class="row cl" id="postageInformation">

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

@@ -38,8 +38,28 @@
     <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="百胜订单号" 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.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">
+
+            <select class="my-select" name="postageCustomerStatus" id="postageCustomerStatus" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
+                <option value="">客服确认</option>
+                <option value="1" <#if postage.postageCustomerStatus??><#if postage.postageCustomerStatus == 1 >selected="selected"</#if></#if>>待确认</option>
+                <option value="2" <#if postage.postageCustomerStatus??><#if postage.postageCustomerStatus == 2 >selected="selected"</#if></#if>>申请中</option>
+            </select>
+            <select class="my-select" name="postageManagerStatus" id="postageManagerStatus" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
+                <option value="">客服审核</option>
+                <option value="1" <#if postage.postageManagerStatus??><#if postage.postageManagerStatus == 1 >selected="selected"</#if></#if>>待审核</option>
+                <option value="2" <#if postage.postageManagerStatus??><#if postage.postageManagerStatus == 2 >selected="selected"</#if></#if>>通过</option>
+                <option value="3" <#if postage.postageManagerStatus??><#if postage.postageManagerStatus == 3 >selected="selected"</#if></#if>>驳回</option>
+            </select>
+            <select class="my-select" name="postageFinanceStatus" id="postageFinanceStatus" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
+                <option value="">财务审核</option>
+                <option value="1" <#if postage.postageFinanceStatus??><#if postage.postageFinanceStatus == 1 >selected="selected"</#if></#if>>待审核</option>
+                <option value="2" <#if postage.postageFinanceStatus??><#if postage.postageFinanceStatus == 2 >selected="selected"</#if></#if>>通过(待转账)</option>
+                <option value="3" <#if postage.postageFinanceStatus??><#if postage.postageFinanceStatus == 3 >selected="selected"</#if></#if>>驳回</option>
+                <option value="4" <#if postage.postageFinanceStatus??><#if postage.postageFinanceStatus == 4 >selected="selected"</#if></#if>>已转账</option>
+            </select>
+
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;height: 35px; id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </form>
     </div>
@@ -122,11 +142,13 @@
                         </#if></td>
                     <td>${postage.salesOrderId!''}</td>
                     <td>${postage.postageClientName!''}</td>
-                    <td><#if (postage.postageClientTel)?? && postage.postageClientTel?length gt 7>
-                    ${postage.postageClientTel?substring(0,3)}***${postage.postageClientTel?substring(postage.postageClientTel?length-4,postage.postageClientTel?length)}
-                    <#else>
-                    ${postage.postageClientTel!''}
-                    </#if>
+                    <td>
+                        <#--<#if (postage.postageClientTel)?? && postage.postageClientTel?length gt 7>-->
+                            <#--${postage.postageClientTel?substring(0,3)}***${postage.postageClientTel?substring(postage.postageClientTel?length-4,postage.postageClientTel?length)}-->
+                        <#--<#else>-->
+                             <#--${postage.postageClientTel!''}-->
+                        <#--</#if>-->
+                        ${postage.postageClientTel!''}
                     </td>
                     <td>${postage.postageClientAddress!''}</td>
                     <td>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/add_batch.ftl

@@ -142,7 +142,7 @@
 </article>
 <script type="text/javascript">
     /*颜色枚举值*/
-    var colorAll = ['黑色','白色','金色','红色','蓝色','绿色','橙色','黄色','青色','紫色','蔷薇粉','云烟紫','琉璃绿','亚麻灰'];
+    var colorAll = ['黑色','白色','金色','红色','蓝色','绿色','橙色','黄色','青色','紫色','粉色','蔷薇粉','云烟紫','琉璃绿','亚麻灰'];
 
 
     /*修改批次时，获取之前的批次编号，添加页面为空*/

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/update_batch.ftl

@@ -172,7 +172,7 @@
 </article>
 <script type="text/javascript">
     /*颜色枚举值*/
-    var colorAll = ['黑色','白色','金色','红色','蓝色','绿色','橙色','黄色','青色','紫色','蔷薇粉','云烟紫','琉璃绿','亚麻灰'];
+    var colorAll = ['黑色','白色','金色','红色','蓝色','绿色','橙色','黄色','青色','紫色','粉色','蔷薇粉','云烟紫','琉璃绿','亚麻灰'];
 
     /*修改批次时，获取之前的批次编号，添加页面为空*/
     var upBatchNo = '${ptsBatch.batchNo}';