Merge branch 'master' into develop

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

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

@@ -1,5 +1,8 @@
 package com.iamberry.rst.core.cm;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -19,6 +22,19 @@ public class PostageInfo implements Serializable{
     private Date postageCreateTime;//创建时间
     private Date postageUpdateTime;//修改时间
 
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date startDate;                 //开始时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date endDate;                   //结束时间
+    //客诉基本信息主键
+    private Integer customerId;
+    //店铺主键
+    private Integer storeId;
+    //客户id
+    private Integer dealerId;
+
     public Integer getPostageId() {
         return postageId;
     }
@@ -98,4 +114,44 @@ public class PostageInfo implements Serializable{
     public void setPostageAlipayType(Integer postageAlipayType) {
         this.postageAlipayType = postageAlipayType;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public Integer getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Integer customerId) {
+        this.customerId = customerId;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getDealerId() {
+        return dealerId;
+    }
+
+    public void setDealerId(Integer dealerId) {
+        this.dealerId = dealerId;
+    }
 }

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

@@ -17,13 +17,13 @@ public class ClaimOrder  implements  Serializable{
     private Integer claimOrderId;
     //财务收款id
     private Integer frId;
-    //订单项表/退货费用
+    //订单项表/邮费id
     private Integer itemId;
     //供应价格/退货邮费费用
     private Integer frPrice;
     //类型 1：正常 2：退货 3：退货邮费
     private Integer claimOrderType;
-    //产品数量 当类型为退货时，为退货数量
+    //产品数量 当类型为退货时，为退货数量  （当 claimOrderType为3时退货邮费 默认为1）
     private Integer claimOrderNum;
 
 
@@ -57,6 +57,16 @@ public class ClaimOrder  implements  Serializable{
     private String salesAddressInfo;        //详细地址
 
 
+    private Integer postageId;//
+    private Integer relationId;//处理方式id
+    private Integer postageStatus;//状态
+    private Integer postageAmount;//邮费金额
+    private String postageAlipay;//支付宝账户
+    private String postageAlipayName;//支付宝姓名
+    private Integer postageAlipayType;//转账类型  1：用户付款  2：客户付款  3：公司付款
+    private String postageDesc;//备注
+
+
     public Integer getClaimOrderId(){
         return claimOrderId;
     }
@@ -304,4 +314,68 @@ public class ClaimOrder  implements  Serializable{
     public void setFrPrice(Integer frPrice) {
         this.frPrice = frPrice;
     }
+
+    public Integer getPostageId() {
+        return postageId;
+    }
+
+    public void setPostageId(Integer postageId) {
+        this.postageId = postageId;
+    }
+
+    public Integer getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Integer relationId) {
+        this.relationId = relationId;
+    }
+
+    public Integer getPostageStatus() {
+        return postageStatus;
+    }
+
+    public void setPostageStatus(Integer postageStatus) {
+        this.postageStatus = postageStatus;
+    }
+
+    public Integer getPostageAmount() {
+        return postageAmount;
+    }
+
+    public void setPostageAmount(Integer postageAmount) {
+        this.postageAmount = postageAmount;
+    }
+
+    public String getPostageAlipay() {
+        return postageAlipay;
+    }
+
+    public void setPostageAlipay(String postageAlipay) {
+        this.postageAlipay = postageAlipay;
+    }
+
+    public String getPostageAlipayName() {
+        return postageAlipayName;
+    }
+
+    public void setPostageAlipayName(String postageAlipayName) {
+        this.postageAlipayName = postageAlipayName;
+    }
+
+    public Integer getPostageAlipayType() {
+        return postageAlipayType;
+    }
+
+    public void setPostageAlipayType(Integer postageAlipayType) {
+        this.postageAlipayType = postageAlipayType;
+    }
+
+    public String getPostageDesc() {
+        return postageDesc;
+    }
+
+    public void setPostageDesc(String postageDesc) {
+        this.postageDesc = postageDesc;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.iamberry.rst.faces.dm;
 
+import com.iamberry.rst.core.cm.PostageInfo;
 import com.iamberry.rst.core.dm.FinancialReceipt;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
@@ -18,6 +19,7 @@ public interface FinancialReceiptService {
      * @return List
      */
     List<FinancialReceipt> getFinancialReceiptList(FinancialReceipt  financialReceipt);
+
     /**
      * 获取集合
      * @param  pageRequest
@@ -48,4 +50,13 @@ public interface FinancialReceiptService {
      * @return Integer
      */
     Integer  delete(Integer  id);
+
+    /**
+     * 获取集合
+     * @param  pageRequest
+     * @return List
+     */
+    PagedResult<PostageInfo> getPostageInfoList(PageRequest<PostageInfo> pageRequest);
+
+
 }

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

@@ -1,6 +1,7 @@
 package com.iamberry.rst.service.dm;
 
 import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.cm.PostageInfo;
 import com.iamberry.rst.core.dm.FinancialReceipt;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
@@ -74,4 +75,12 @@ public class FinancialReceiptServiceImpl  implements FinancialReceiptService {
     public  Integer  delete(Integer  id){
         return  financialReceiptMapper.delete(id);
     }
+
+    @Override
+    public  PagedResult<PostageInfo> getPostageInfoList(PageRequest<PostageInfo> pageRequest){
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<PostageInfo> postageInfoList = financialReceiptMapper.getPostageInfoList(pageRequest.getData());
+        return PageUtil.getPage(postageInfoList);
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.iamberry.rst.service.dm.mapper;
 
+import com.iamberry.rst.core.cm.PostageInfo;
 import com.iamberry.rst.core.dm.FinancialReceipt;
 
 import java.util.List;
@@ -40,4 +41,11 @@ public interface FinancialReceiptMapper {
      * @return Integer
      */
     Integer  delete(Integer  id);
+
+    /**
+     * 获取集合
+     * @param  postageInfo
+     * @return List
+     */
+    List<PostageInfo> getPostageInfoList(PostageInfo  postageInfo);
 }

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

@@ -21,6 +21,7 @@
         select
         <include refid="Base_List" />,
         soi.*,
+        pi.*,
         oi.sales_deal_code,
         oi.sales_pay_time,
         oi.sales_address_name,
@@ -29,10 +30,11 @@
         si.store_name,
         sa.admin_name AS salesAdminName
         from tb_rst_dm_claim_order t
-        LEFT JOIN tb_rst_sales_order_item soi ON soi.item_id = t.item_id
+        LEFT JOIN tb_rst_sales_order_item soi ON soi.item_id = t.item_id AND (t.claim_order_type = 1 OR t.claim_order_type = 2)
         LEFT JOIN tb_rst_sales_order_info oi ON oi.sales_id = soi.item_order_id
         LEFT JOIN tb_rst_store_info si ON si.store_id = oi.sales_store_id
         LEFT JOIN tb_rst_sys_admin sa ON sa.admin_id = oi.sales_admin_id
+        LEFT JOIN tb_rst_postage_info pi ON t.item_id = pi.postage_id AND t.claim_order_type = 3
         <where>
             <if test="claimOrderId != null ">
                 AND t.claim_order_id = #{claimOrderId}

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

@@ -145,4 +145,50 @@
         tb_rst_dm_financial_receipt
         where fr_id=#{frId}
     </delete>
+
+
+    <select id="getPostageInfoList" resultType="PostageInfo" parameterType="PostageInfo" >
+        SELECT
+          rpi.*,
+          cci.customer_id
+        FROM tb_rst_postage_info rpi
+        LEFT JOIN tb_rst_cm_relation rcr ON rpi.relation_id = rcr.relation_id
+        LEFT JOIN tb_rst_cm_customer_info cci ON rcr.customer_id = cci.customer_id
+        <where>
+            <if test="postageAlipayType != null ">
+                AND rpi.postage_alipay_type = #{postageAlipayType}
+            </if >
+            <if test="postageStatus != null ">
+                AND rpi.postage_status = #{postageStatus}
+            </if >
+            <if test="customerId != null ">
+                AND cci.customer_id = #{customerId}
+            </if >
+            <if test="storeId != null ">
+                AND cci.store_id = #{storeId}
+            </if >
+            <if test="dealerId != null ">
+                AND cci.store_id IN (
+                    select
+                    distinct t.store_id
+                    from
+                    tb_rst_store_info t
+                    LEFT JOIN tb_rst_dm_dealer_channel_store dcs ON t.store_id = dcs.store_id
+                    LEFT JOIN tb_rst_dm_dealer_channel dc ON dcs.deal_channel_id = dc.deal_channel_id
+                    WHERE dc.dealer_id = #{dealerId}
+                )
+            </if >
+            <if test="startDate != null and startDate != ''">
+                <![CDATA[
+                    AND cci.customer_create_time >= #{startDate}
+                ]]>
+            </if >
+            <if test="endDate != null and endDate != ''">
+                <![CDATA[
+                    AND cci.customer_create_time <= #{endDate}
+                ]]>
+            </if >
+        </where>
+        ORDER BY rpi.postage_id DESC
+    </select>
 </mapper>

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

@@ -1,6 +1,7 @@
 package com.iamberry.rst.controllers.dm;
 
 import com.iamberry.rst.core.cm.CompanyInfo;
+import com.iamberry.rst.core.cm.PostageInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.StoreInfo;
 import com.iamberry.rst.core.dm.ClaimOrder;
@@ -484,11 +485,19 @@ public class FinanciaReceController {
      */
     @ResponseBody
     @RequestMapping(value = "/select_post")
-    public ResponseJson selectPost(HttpServletRequest request) {
+    public ResponseJson selectPost(HttpServletRequest request,PostageInfo postageInfo,
+                                    @RequestParam(value = "pageSize", defaultValue = "100", required = false) Integer pageSize,
+                                   @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
+                                   @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
         ResponseJson rj = new ResponseJson(200, "查询成功", 200);
-//        List<StoreInfo> storeInfoList = storeInfoService.listStoreByDealer(storeInfo);
-//
-//        rj.addResponseKeyValue("storeInfoList", storeInfoList);
+        // 封装请求数据
+        PageRequest<PostageInfo> pageRequest = new PageRequest<>(postageInfo, pageNO, pageSize, totalNum == 0);
+        // 查询订单列表
+        PagedResult<PostageInfo> pagedResult = financialReceiptService.getPostageInfoList(pageRequest);
+        if (totalNum != 0) {
+            pagedResult.setTotal(totalNum);
+        }
+        rj.addResponseKeyValue("pagedResult", pagedResult);
         return rj;
     }
 

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

@@ -131,7 +131,7 @@
                             <#if claimOrderList?? &&  (claimOrderList?size > 0) >
                                 <#list claimOrderList as claimOrder>
                                     <#if claimOrder.claimOrderType == 1 >
-                                        <tr class="text-c order_item itemNum_${claimOrder_index}" orderItem="1">
+                                        <tr class="text-c order_item itemNum_order_${claimOrder_index}" orderItem="1">
                                             <input type="hidden" class="itemId" value="${claimOrder.itemId}">
                                             <input type="hidden" class="itemProductDiscount" value="${((claimOrder.frPrice/100/claimOrder.claimOrderNum)?string("0.##"))!''}">
                                             <td class="itemTotal">${((claimOrder.frPrice/100)?string("0.##"))!''}</td>
@@ -191,7 +191,7 @@
                             <#if claimOrderList?? &&  (claimOrderList?size > 0) >
                                 <#list claimOrderList as claimOrder>
                                     <#if claimOrder.claimOrderType == 2 >
-                                        <tr class="text-c order_item itemNum_${claimOrder_index}"  orderItem="2">
+                                        <tr class="text-c order_item itemNum_return_${claimOrder_index}"  orderItem="2">
                                             <input type="hidden" class="itemId" value="${claimOrder.itemId}">
                                             <input type="hidden" class="itemProductDiscount" value="${((claimOrder.itemProductDiscount/100/claimOrder.claimOrderNum)?string("0.##"))!''}">
                                             <td class="itemTotal">${((claimOrder.frPrice/100)?string("0.##"))!''}</td>
@@ -199,7 +199,7 @@
                                             <td>${claimOrder.storeName!''}</td>
                                             <td>${claimOrder.itemProductName!''}</td>
                                             <td>${claimOrder.itemProductColor!''}</td>
-                                            <td>${((claimOrder.frPrice/100)?string("0.##"))!''}</td>
+                                            <td>${((claimOrder.frPrice/100*-1)?string("0.##"))!''}</td>
                                             <td class="itemNum">${claimOrder.itemNum!'0'}</td>
                                             <td style="width: 70px;"><input type="text" style="text-align: center;" class="input-text input-number decimal_input itemReturnNum" value="${claimOrder.claimOrderNum}"    onkeyup="keyFun($(this),${claimOrder.itemNum!'999'},0)" onpaste="keyFun($(this),${claimOrder.itemNum!'999'},0)" ></td>
                                             <td>${(claimOrder.salesPayTime?string("yyyy-MM-dd"))!''}</td>
@@ -207,9 +207,9 @@
                                             <td>${claimOrder.salesAddressName!''}<br>${claimOrder.salesAddressTel!''}</td>
                                             <td alt="${claimOrder.salesAddressInfo!''}" title="${claimOrder.salesAddressInfo!''}">
                                                 <#if claimOrder.salesAddressInfo?length gt 15>
-                                                ${claimOrder.salesAddressInfo?substring(0,12)}...
+                                                    ${claimOrder.salesAddressInfo?substring(0,12)}...
                                                 <#else>
-                                                ${claimOrder.salesAddressInfo!''}
+                                                    ${claimOrder.salesAddressInfo!''}
                                                 </#if>
                                             </td>
                                             <td><a href="javascript:void(0)" class="all_down" onclick="deleteTableByTr_orderDesc($(this))">删除</a></td>
@@ -236,16 +236,54 @@
                             <th width="50">邮费金额</th>
                             <th width="50">支付宝姓名</th>
                             <th width="100">支付宝账号</th>
+                            <th width="30">转账类型</th>
                             <th width="30">状态</th>
                             <th width="60">备注</th>
                             <th width="20">操作</th>
                         </tr>
                         </thead>
-                        <tbody id="returnAll">
+                        <tbody id="postageAll">
                         <#if claimOrderList?? &&  (claimOrderList?size > 0) >
                             <#list claimOrderList as claimOrder>
-                                <#if claimOrder.claimOrderType == 2 >
-
+                                <#if claimOrder.claimOrderType == 3 >
+                                    <tr class="text-c order_item itemNum_post_${claimOrder_index}" orderitem="3">
+                                        <input type="hidden" class="itemId" value="${claimOrder.itemId}">
+                                        <input type="hidden" class="postageAmount" value="${((claimOrder.frPrice/100)?string("0.##"))!''}">
+                                        <td class="itemTotal">${((claimOrder.frPrice/100)?string("0.##"))!''}</td>
+                                        <td>${((claimOrder.frPrice/100*-1)?string("0.##"))!''}</td>
+                                        <td>${claimOrder.postageAlipayName!''}</td>
+                                        <td>${claimOrder.postageAlipay!''}</td>
+                                        <td>
+                                            <#if claimOrder.postageAlipayType??>
+                                                <#if claimOrder.postageAlipayType = 1 >
+                                                    用户付款
+                                                <#elseif claimOrder.postageAlipayType = 2 >
+                                                    客户付款
+                                                <#elseif claimOrder.postageAlipayType = 3 >
+                                                    公司付款
+                                                </#if>
+                                            </#if>
+                                        </td>
+                                        <td>
+                                            <#if claimOrder.postageStatus?? >
+                                                <#if claimOrder.postageStatus = 1 >
+                                                    未申请
+                                                <#elseif claimOrder.postageStatus = 2 >
+                                                    已申请（待转账）
+                                                <#elseif claimOrder.postageStatus = 3 >
+                                                    已转账
+                                                <#elseif claimOrder.postageStatus = 4 >
+                                                    其他
+                                                </#if>
+                                             </#if>
+                                        </td>
+                                        <td>
+                                            ${claimOrder.postageDesc!''}
+                                        </td>
+                                        <td>
+                                            <a href="javascript:void(0)" class="all_down" onclick="deleteTableByTr_orderDesc($(this))">删除</a>
+                                        </td>
+                                    </tr>
                                 </#if>
                             </#list>
                         </#if>
@@ -433,6 +471,50 @@
     }
 
     /**
+     * 展示邮费
+     */
+    function showPost(postageInfoArray) {
+        for(var i=0;i<postageInfoArray.length;i++){
+            var postageInfo = postageInfoArray[i];
+
+            //转账类型  1：用户付款  2：客户付款  3：公司付款
+            var postageAlipayType ='';
+            if(postageInfo.postageAlipayType == 1){
+                postageAlipayType = '用户付款';
+            }else if(postageInfo.postageAlipayType == 2){
+                postageAlipayType = '客户付款';
+            }else if(postageInfo.postageAlipayType == 3){
+                postageAlipayType = '公司付款';
+            }
+
+            var postageStatus = '';
+            if(postageInfo.postageStatus == 0 || postageInfo.postageStatus == 1){
+                postageStatus = '未申请';
+            }else if(postageInfo.postageStatus == 2){
+                postageStatus = '已申请（待转账）';
+            }else if(postageInfo.postageStatus == 3){
+                postageStatus = '已转账';
+            }else if(postageInfo.postageStatus == 4){
+                postageStatus = '未知';
+            }
+            html = '<tr class="text-c order_item itemNum_'+ i +'" orderItem="3">' +
+                    '<input type="hidden" class="itemId" value="'+  postageInfo.postageId +'">' +
+                    '<input type="hidden" class="postageAmount" value="'+  postageInfo.postageAmount +'">' +
+                    ' <td class="itemTotal">'+ -postageInfo.postageAmount +'</td>' +
+                    ' <td>'+ postageInfo.postageAmount +'</td>' +
+                    ' <td>'+ postageInfo.postageAlipayName +'</td>' +
+                    ' <td>'+ postageInfo.postageAlipay +'</td>' +
+                    ' <td>'+ postageAlipayType +'</td>' +
+                    ' <td>'+ postageStatus +'</td>' +
+                    ' <td>'+ postageInfo.postageDesc +'</td>' +
+                    ' <td><a href="javascript:void(0)" class="all_down" onclick="deleteTableByTr_orderDesc($(this))">删除</a></td>' +
+                    '</tr>';
+            $("#postageAll").append(html);
+        }
+        calculaAllAmount();
+    }
+
+    /**
      * 计算总金额
      */
     function calculaAllAmount(){
@@ -445,11 +527,15 @@
             if($(this).attr("orderItem") == 1){
                 total = accAdd(total,itemTotal);
                 var itemNum = $(this).find(".itemNum").text();
-                allNormalProduct = accAdd(allNormalProduct,itemNum);
-            }else{
+               // allNormalProduct = accAdd(allNormalProduct,itemNum);
+            }else if($(this).attr("orderItem") == 2){
+                total = accAdd(total,itemTotal);
+                //var itemReturnNum = $(this).find(".itemReturnNum").val();
+               // allReturnProduct = accAdd(allReturnProduct,itemReturnNum);
+            }else if($(this).attr("orderItem") == 3){
                 total = accAdd(total,itemTotal);
-                var itemReturnNum = $(this).find(".itemReturnNum").val();
-                allReturnProduct = accAdd(allReturnProduct,itemReturnNum);
+               // var itemReturnNum = $(this).find(".itemReturnNum").val();
+               // allReturnProduct = accAdd(allReturnProduct,itemReturnNum);
             }
         });
         $("#allAmount").text(total);
@@ -491,9 +577,12 @@
                     if($(this).attr("orderItem") == 1){
                         claimOrder.claimOrderType = 1;
                         claimOrder.claimOrderNum = $(this).find(".itemNum").text();
-                    }else{
+                    }else  if($(this).attr("orderItem") == 2){
                         claimOrder.claimOrderType = 2;
                         claimOrder.claimOrderNum = $(this).find(".itemReturnNum").val();
+                    }else  if($(this).attr("orderItem") == 3){
+                        claimOrder.claimOrderType = 3;
+                        claimOrder.claimOrderNum = 1;
                     }
 
                     var  frPrice =  $(this).find(".itemTotal").text();

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

@@ -98,12 +98,30 @@
                     </div>
 
                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;"> <span class="select-box">
-                        <select name="storeId" class="select" id="storeId">
-                            <option></option>
+                        <select name="postageAlipayType" class="select" id="postageAlipayType">
+                            <option value="">转账类型</option>
+                            <option value="1">用户付款</option>
+                            <option value="2">客户付款</option>
+                            <option value="3">公司付款</option>
                         </select>
                         </span>
                     </div>
 
+                    <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;"> <span class="select-box">
+                        <select name="postageStatus" class="select" id="postageStatus">
+                            <option value="">状态</option>
+                            <option value="1">未申请</option>
+                            <option value="2">已申请</option>
+                            <option value="3" selected>已转账</option>
+                            <option value="4">其他</option>
+                        </select>
+                        </span>
+                    </div>
+
+                    <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" >
+                        <input type="text" class="input-text" value="" placeholder="客诉ID" id="customerId" name="customerId" >
+                    </div>
+
                     <div class="formControls col-4 col-sm-4" style="padding: 0px 10px 0px 0px; width: 125px;">
                         <input type="text" style="width:120px;height:30px;margin-right: 0px;font-size: 9px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间(客诉创建日期)" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss'})"  readonly="readonly"/>
                     </div>
@@ -111,22 +129,6 @@
                         <input type="text" style="width:120px;height:30px;margin-right: 0px;font-size: 9px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间(客诉创建日期)" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss'})"  readonly="readonly"/>
                     </div>
 
-
-
-
-
-                    <div class="formControls col-2 col-sm-2"  style="padding: 0px 10px 0px 0px; width: 110px;">
-                        <input type="text" class="input-text" value="" placeholder="订单号" id="salesOrderId" name="">
-                    </div>
-
-                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" >
-                         <input type="text" class="input-text" value="" placeholder="收货人姓名" id="salesAddressName" name="">
-                     </div>
-                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;">
-                         <input type="text" class="input-text" value="" placeholder="收货人电话" id="salesAddressTel" name="">
-                     </div>
-
-
                      <div class="formControls col-1 col-sm-1" >
                          <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="searchOrder" name="">搜索</button>
                      </div>
@@ -203,71 +205,74 @@
             shade: [0.5,'#fff'] //0.1透明度的白色背景
         });
 
-        var salesCompanyId = cufte($("#companyId").val());
-        var salesStoreId = cufte($("#storeId").val());
-        var salesOrderStatus = cufte($("#salesOrderStatus").val());
-        var salesStatus = cufte($("#salesStatus").val());
-        var salesId = cufte($("#salesId").val());
-        var salesAddressName =cufte($("#salesAddressName").val());
-        var salesAddressTel = cufte($("#salesAddressTel").val());
-        var salesOrderId = cufte($("#salesOrderId").val());
+        var dealerId = cufte($("#dealerId option:checked").val());
+        var storeId = cufte($("#storeId option:checked").val());
+        var postageAlipayType = cufte($("#postageAlipayType").val());
+        var customerId = cufte($("#customerId").val());
+        var postageStatus = cufte($("#postageStatus").val());
         var startDate = cufte($("#startDate").val());
         var endDate = cufte($("#endDate").val());
 
         $.ajax({
             type: "POST",
             data: {
-                salesCompanyId : salesCompanyId,
-                salesStoreId : salesStoreId,
-                salesOrderStatus : salesOrderStatus,
-                salesStatus : salesStatus,
-                salesId : salesId,
-                salesOrderId : salesOrderId,
-                salesAddressName : salesAddressName,
-                salesAddressTel : salesAddressTel,
+                dealerId : dealerId,
+                storeId : storeId,
+                postageAlipayType : postageAlipayType,
+                customerId : customerId,
+                postageStatus : postageStatus,
                 startDate : startDate,
                 endDate : endDate,
-                orderDateType : 1,
                 pageSize : 100
             },
-            url: "${path}/admin/salesOrder/select_order_page",
+            url: "${path}/admin/financial_receipt/select_post",
             async: true,
             success: function(data){
                 var html = "";
                 if (data.returnCode == 200 && data.returnMsg.pagedResult.dataList.length > 0 ) {
                     for(var i=0;i<data.returnMsg.pagedResult.dataList.length;i++){
-                        var salesOrder = data.returnMsg.pagedResult.dataList[i];
+                        var postageInfo = data.returnMsg.pagedResult.dataList[i];
                         var disHtml =  "";
                         var productsHtml = '';
-                        var salesOrderItem = salesOrder.salesOrderItemList;
-                        for(var j=0;j<salesOrderItem.length;j++){
-                            var item = interceptToString(salesOrderItem[j].itemProductName) +'('+salesOrderItem[j].itemProductColor+ ")*" + salesOrderItem[j].itemNum;
-                                productsHtml += '<span class="label label-success radius" title="'+ salesOrderItem[j].itemProductName +'('+salesOrderItem[j].itemProductColor+')*'+ (salesOrderItem[j].itemNum - salesOrderItem[j].itemReturnNum) +'">' + item + '</span>';
+
+                        if(postageInfo.postageStatus != 3){
+                            disHtml = 'disabled="disabled" title="只能选择已转账的邮费" ';
                         }
-                        var time = formatDate(new Date(salesOrder.salesPayTime),"yyyy-MM-dd");
-                        var orderStatus = null;
-                        if(salesOrder.procTypeId == 0 || salesOrder.procTypeId == null || salesOrder.procTypeId == ""){
-                            orderStatus = "正常";
-                        }else{
-                            orderStatus = salesOrder.procTypeName;
+
+                        //转账类型  1：用户付款  2：客户付款  3：公司付款
+                        var postageAlipayType ='';
+                        if(postageInfo.postageAlipayType == 1){
+                            postageAlipayType = '用户付款';
+                        }else if(postageInfo.postageAlipayType == 2){
+                            postageAlipayType = '客户付款';
+                        }else if(postageInfo.postageAlipayType == 3){
+                            postageAlipayType = '公司付款';
                         }
 
-                        if(salesOrder.salesStatus != 1){
-                            disHtml = 'disabled="disabled" title="只能选择已确认的订单" ';
+                        var postageStatus = '';
+                        if(postageInfo.postageStatus == 0 || postageInfo.postageStatus == 1){
+                            postageStatus = '未申请';
+                        }else if(postageInfo.postageStatus == 2){
+                            postageStatus = '已申请（待转账）';
+                        }else if(postageInfo.postageStatus == 3){
+                            postageStatus = '已转账';
+                        }else if(postageInfo.postageStatus == 4){
+                            postageStatus = '未知';
                         }
+                        var time = formatDate(new Date(postageInfo.postageCreateTime),"yyyy-MM-dd");
+
                         html += '<tr class="text-c">' +
-                                ' <td><input type="checkbox" class="sales_order_id" title="" id="" value="'+ salesOrder.salesId +'" '+ disHtml  +'></td>' +
-                                ' <td>'+ cufte(salesOrder.companyName) +'</td>' +
-                                ' <td>'+ cufte(salesOrder.storeName) +'</td>' +
-                                ' <td>'+ cufte(salesOrder.salesOrderId) +'</td>' +
-                                ' <td>'+ salesOrder.salesDealCode +'</td>' +
-                                ' <td>'+ salesOrder.salesAddressName +'</td>' +
-                                ' <td>'+ salesOrder.salesAddressTel +'</td>' +
-                                ' <td>'+ salesOrder.salesAmount/100 +'</td>' +
-                                ' <td>'+ productsHtml +'</td>' +
+                                '<input type="hidden" class="postageAlipayType" value="'+ postageInfo.postageAlipayType +'">' +
+                                '<input type="hidden" class="postageStatus" value="'+ postageInfo.postageStatus +'">' +
+                                ' <td><input type="checkbox" class="sales_order_id" title="" id="" value="'+ postageInfo.postageId +'" '+ disHtml  +'></td>' +
+                                ' <td class="customerId">'+ cufte(postageInfo.customerId) +'</td>' +
+                                ' <td class="postageAmount">'+ accDiv(cufte(postageInfo.postageAmount),100) +'</td>' +
+                                ' <td class="postageAlipayName">'+ cufte(postageInfo.postageAlipayName) +'</td>' +
+                                ' <td class="postageAlipay">'+ cufte(postageInfo.postageAlipay) +'</td>' +
+                                ' <td>'+ postageAlipayType +'</td>' +
+                                ' <td>'+ postageStatus +'</td>' +
+                                ' <td class="postageDesc">'+ cufte(postageInfo.postageDesc) +'</td>' +
                                 ' <td>'+ time +'</td>' +
-                                ' <td>'+ orderStatus +'</td>' +
-                                ' <td>'+ salesOrder.salesAddressInfo +'</td>' +
                                 ' </tr>';
                     }
                 }else{
@@ -286,13 +291,23 @@
      * 选择订单，返回订单内容到父级
      */
     function selectOrderInfo() {
-        var orderIds = "";
+        var postageInfoArray = new Array();
         $(".sales_order_id").each(function(){
             if($(this).is(':checked')){
-                orderIds += $(this).val() + "_";
+                var postageInfo = new Object();
+                postageInfo.postageId  = $(this).val();
+                var $postTr = $(this).parents("tr");
+                postageInfo.postageAlipayType  = $postTr.find(".postageAlipayType").val();
+                postageInfo.postageStatus  = $postTr.find(".postageStatus").val();
+                postageInfo.customerId  = $postTr.find(".customerId").text();
+                postageInfo.postageAmount  = $postTr.find(".postageAmount").text();
+                postageInfo.postageAlipayName  = $postTr.find(".postageAlipayName").text();
+                postageInfo.postageAlipay  = $postTr.find(".postageAlipay").text();
+                postageInfo.postageDesc  = $postTr.find(".postageDesc").text();
+                postageInfoArray.push(postageInfo)
             }
         })
-        parent.showSelectOrder(orderIds);
+        parent.showPost(postageInfoArray);
         parent.layer.close(parent.layer.getFrameIndex(window.name));
     }
 
@@ -304,11 +319,9 @@
 
 
 <script>
-    /**
-     * 展示销售公司
-     */
+    //展示销售公司
     function setStore(dealerId,node){
-        var dealerId = $("#dealerId").val();
+        var dealerId = cufte($("#dealerId option:checked").val());
         var html = '<option value="">店铺</option>';
         $.ajax({
             type: "POST",