邮费转账

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

@@ -197,10 +197,10 @@
 
   <select id="getPostageNumber" resultType="Integer" parameterType="Postage" >
     select
-      COUNT (p.postage_id)
+      count(p.postage_id)
     from tb_rst_postage p
     <where>
-        p.customer_id = #{customerId}
+        p.company_id = #{companyId}
       <if test="adminId != null and adminId != ''">
         AND p.admin_id = #{adminId}
       </if>

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

@@ -458,8 +458,8 @@ public class MQTask implements InitializingBean {
 
 
 	/**客诉系统  自动追踪发货信息**/
-	@Scheduled(cron = "0 0/2 * * * ?")//每30分钟执行一次
-	//	@Scheduled(cron = "0 0 9 * * ?")//每天上午午9点触发
+//	@Scheduled(cron = "0 0/2 * * * ?")//每2分钟执行一次
+	@Scheduled(cron = "0 0 9 * * ?")//每天上午午9点触发
 	public void postageRemind()throws Exception{
 
 		Map<Integer,Integer> map = new HashMap<Integer,Integer>();
@@ -496,7 +496,7 @@ public class MQTask implements InitializingBean {
 			pt.setPostageManagerStatus(1);		//客服经理审核  1：审核中
 			for (Integer customerManager: authorityCustomerManagerSet) {	//customerManager 为id
 				Integer postageNumber = postageService.getPostageNumber(pt);
-				if(map.get(customerManager) != null){
+				if(map.get(customerManager) == null){
 					map.put(customerManager,postageNumber);
 				}else{
 					Integer number  = map.get(customerManager);
@@ -509,7 +509,7 @@ public class MQTask implements InitializingBean {
 			pt.setPostageFinanceStatus(1);		//状态（财务审核） 1：审核中
 			for (Integer financialManager: authorityFinancialManagerSet) {    //financialManager 为id
 				Integer postageNumber = postageService.getPostageNumber(pt);
-				if(map.get(financialManager) != null){
+				if(map.get(financialManager) == null){
 					map.put(financialManager,postageNumber);
 				}else{
 					Integer number  = map.get(financialManager);
@@ -522,7 +522,7 @@ public class MQTask implements InitializingBean {
 			pt.setPostageFinanceStatus(2);		//状态（财务审核） 2：通过（已申请待转账）
 			for (Integer financialPayment: authorityFinancialPaymentSet) {    //financialPayment 为id
 				Integer postageNumber = postageService.getPostageNumber(pt);
-				if(map.get(financialPayment) != null){
+				if(map.get(financialPayment) == null){
 					map.put(financialPayment,postageNumber);
 				}else{
 					Integer number  = map.get(financialPayment);
@@ -542,6 +542,9 @@ public class MQTask implements InitializingBean {
 				logger.info("邮费转账发送待处理短信，手机号码为空，"+ tel+"===id为"+m.getKey());
 				continue;
 			}
+			if(number == null || number == 0){
+				continue;
+			}
 			String text = MessageFormat.format(REMIND_POSTAGE_PENDING,number);
 			smsService.sendOtherCMS(tel,text);
 		}

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

@@ -136,6 +136,7 @@
                     </#list>
                 </div>
             </div>
+
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">客户信息：</label>
                 <div class="formControls col-2 col-sm-2 skin-minimal">
@@ -148,6 +149,7 @@
                     <input type="text" class="input-text" placeholder="用户电话" id="customerTel" name="customerTel" value="${customerInfo.customerTel!''}">
                 </div>
             </div>
+
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>二次售后：</label>
                 <div class="formControls col-10 col-sm-10 skin-minimal">
@@ -272,7 +274,6 @@
             <input type="hidden" id="closedProdcues" name="closedProdcuesJson" value="">
             <input type="hidden" id="closedFittings" name="closedFittingsJson" value="">
 
-
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">处理类型：</label>
                 <div class="formControls col-10 col-sm-10 skin-minimal">

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

@@ -108,7 +108,7 @@
             </div>
         </div>
 
-        <div class="row cl" id="sendaddressDescInfo" style="display: none">
+        <div class="row cl" id="sendaddressDescInfo" style="">
             <label class="form-label col-2 col-sm-2 text-r"></label>
             <div class="formControls col-10 col-sm-10">
                 <input type="text" class="input-text" value="" placeholder="请填写详细地址" id="reissueSendAddress" name="reissueSendAddress" seleType="sendInformation">

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

@@ -175,11 +175,17 @@
                     <td>${postage.postageAlipay!''}</td>
                     <td>${postage.postageAlipayName!''}</td>
                     <td>
-                        <div>
-                            <a class="example-image-link" href="${path}${postage.postageLogisticsImg!''}" data-lightbox="example-1" data-title="图片标题">
-                                 <img class="example-image" src="${path}${postage.postageLogisticsImg!''}" style="width: 50px;" alt="image-1" />
-                            </a>
-                        </div>
+                        <#if (postage.postageLogisticsImg) ??>
+                            <#if (postage.postageLogisticsImg) != "">
+                                <div>
+                                    <a class="example-image-link" href="${path}${postage.postageLogisticsImg!''}" data-lightbox="example-1" data-title="图片标题">
+                                         <img class="example-image" src="${path}${postage.postageLogisticsImg!''}" style="width: 50px;" alt="image-1" />
+                                    </a>
+                                </div>
+                            <#else>
+                                -
+                            </#if>
+                        </#if>
                     </td>
                     <td>
                         <#if postage.postageCustomerStatus == 1 && postage.customerConfirm == 1 >
@@ -214,7 +220,7 @@
                 </tr>
                 </#list>
             <#else>
-            <tr><td colspan="17" class="td-manage text-c" >暂时没有邮费信息！</td></tr>
+            <tr><td colspan="18" class="td-manage text-c" >暂时没有邮费信息！</td></tr>
             </#if>
             </tbody>
         </table>

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

@@ -505,8 +505,13 @@ function initProcessResult(type){
                 $("#updateProduct").hide(); //换新产品
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
-
                 //$("#salesChannelsSelect").hide();  //屏蔽销售公司
+
+                var orderId = $("#orderId").val();
+                if(orderId != null && orderId != ""){
+                    setSelectOrder(orderId);
+                }
+
                 break;
             case 4: //维修
                 result = isSolve.maintain;
@@ -528,6 +533,12 @@ function initProcessResult(type){
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").hide();  //屏蔽销售公司
+
+                var orderId = $("#orderId").val();
+                if(orderId != null && orderId != ""){
+                    setSelectOrder(orderId);
+                }
+
                 break;
             case 5://补发
                 result = isSolve.reissue;
@@ -549,6 +560,12 @@ function initProcessResult(type){
                 $("#postageAccount").hide();    //邮费转账账户 -- 隐藏
                 visitByType(2); //需要回访
                 $("#salesChannelsSelect").hide();  //屏蔽销售公司
+
+                var orderId = $("#orderId").val();
+                if(orderId != null && orderId != ""){
+                    setSelectOrder(orderId);
+                }
+
                 break;
             case 6: //退货
                 result = isSolve.backGoods;
@@ -570,6 +587,12 @@ function initProcessResult(type){
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").hide();  //屏蔽销售公司
+
+                var orderId = $("#orderId").val();
+                if(orderId != null && orderId != ""){
+                    setSelectOrder(orderId);
+                }
+
                 break;
             case 7://无理由退货
                 result = isSolve.noReasonBack;
@@ -591,6 +614,12 @@ function initProcessResult(type){
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").hide();  //屏蔽销售公司
+
+                var orderId = $("#orderId").val();
+                if(orderId != null && orderId != ""){
+                    setSelectOrder(orderId);
+                }
+
                 break;
             default:
                 break;
@@ -957,16 +986,15 @@ function selectOrder(){
  * 显示选择的订单
  */
 function setSelectOrder(orderId){
+    var index = layer.load(1, {
+        shade: [0.5,'#fff'] //0.1透明度的白色背景
+    });
+
     if(orderId == null || orderId  == "" || typeof (orderId)=="undefined"){
         layer.msg("未选中订单", {icon: 5, time: 3000});
         return false
     }
-    var html = '';
-    var addresHtml = '';
-    var address = ''; //地址
-    var orderItemList = {};
-    var companyId = ''; //销售公司
-    var storeId = '';  //店铺
+
     $.ajax({
         type: "POST",
         data: {
@@ -975,6 +1003,13 @@ function setSelectOrder(orderId){
         url: url_path + "/admin/customer/select_salesOrder",
         async: false,
         success: function(data){
+            var html = '';
+            var addresHtml = '';
+            var address = ''; //地址
+            var orderItemList = {};
+            var companyId = ''; //销售公司
+            var storeId = '';  //店铺
+
             if (data.returnCode == 200) {
                 for(var i=0;i<data.returnMsg.salesOrderList.length;i++){
                     var salesOrder = data.returnMsg.salesOrderList[i];
@@ -1027,18 +1062,23 @@ function setSelectOrder(orderId){
             $("#showOrder").html(html);  //显示订单
             $("#showOrderAddress").html(addresHtml);  //显示订单地址
             $("#showOrderAddress").show();
+
+
+            $("#addressInfo").val(address);
+            setAdress();  //显示地址
+            setProduce(orderItemList); //显示产品
+
+            $("#companyId").val(companyId);
+            $("#storeId").val(storeId);
+            $("#orderId").val(orderId);
+            getCompany();
+
+            layer.close(index);
         },
         error: function(XmlHttpRequest, textStatus, errorThrown){
+            layer.close(index);
         }
     });
-    $("#addressInfo").val(address);
-    setAdress();  //显示地址
-    setProduce(orderItemList); //显示产品
-
-    $("#companyId").val(companyId);
-    $("#storeId").val(storeId);
-    $("#orderId").val(orderId);
-    getCompany();
 }
 
 /**