Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

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

@@ -172,6 +172,9 @@ public class SalesOrder implements Serializable {
     private Integer salesIsSublist;//是否属于子单 1否 2是
     private Integer salesBelongOrderId;//所属订单
     private List<SalesOrderItem> suSalesOrderItemList = new ArrayList<SalesOrderItem>();
+
+    private Integer salesReturnGoods;//该字段控制订单项是否有退货的产品   1：没有  2：有
+
     public Integer getSalesOldOrderStatus() {
         return salesOldOrderStatus;
     }
@@ -994,28 +997,4 @@ public class SalesOrder implements Serializable {
     public void setDealerAdminId(Integer dealerAdminId) {
         this.dealerAdminId = dealerAdminId;
     }
-
-    public Integer getSalesIsSublist() {
-        return salesIsSublist;
-    }
-
-    public void setSalesIsSublist(Integer salesIsSublist) {
-        this.salesIsSublist = salesIsSublist;
-    }
-
-    public Integer getSalesBelongOrderId() {
-        return salesBelongOrderId;
-    }
-
-    public void setSalesBelongOrderId(Integer salesBelongOrderId) {
-        this.salesBelongOrderId = salesBelongOrderId;
-    }
-
-    public List<SalesOrderItem> getSuSalesOrderItemList() {
-        return suSalesOrderItemList;
-    }
-
-    public void setSuSalesOrderItemList(List<SalesOrderItem> suSalesOrderItemList) {
-        this.suSalesOrderItemList = suSalesOrderItemList;
-    }
 }

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

@@ -56,6 +56,8 @@ public class DmDealer  implements  Serializable{
     private String dealChannelName;
     //订单总额
     private String itemTotal;
+    //订单总额
+    private String itemCostTotal;
     //已认领金额
     private String claimOrderTotal;
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -289,4 +291,12 @@ public class DmDealer  implements  Serializable{
     public void setStoreId(Integer storeId) {
         this.storeId = storeId;
     }
+
+    public String getItemCostTotal() {
+        return itemCostTotal;
+    }
+
+    public void setItemCostTotal(String itemCostTotal) {
+        this.itemCostTotal = itemCostTotal;
+    }
 }

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

@@ -1644,6 +1644,12 @@
                     WHERE dc.dealer_id = #{dealerId}
                 )
             </if>
+            <if test="salesReturnGoods != null and salesReturnGoods == 1">
+                AND  oi.item_return_num <![CDATA[=]]> 0
+            </if>
+            <if test="salesReturnGoods != null and salesReturnGoods == 2">
+                AND  oi.item_return_num <![CDATA[>]]> 0
+            </if>
         </where>
         GROUP BY tt.sales_id
         ORDER BY tt.sales_id DESC

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

@@ -232,6 +232,7 @@
             ddc.deal_channel_name,
             dcs.store_id,
             cast(round(SUM(soix.item_total)/100,2)   as   decimal(11,2))  as itemTotal,
+            cast(round(SUM(soix.item_cost_total) / 100, 2) AS DECIMAL (11, 2) ) AS itemCostTotal,
             cast(round(xx.claim_order_total/100,2)   as   decimal(11,2)) as claimOrderTotal
         FROM tb_rst_dm_dealer t
         LEFT JOIN tb_rst_sys_admin sa ON sa.admin_id = t.create_id
@@ -259,7 +260,10 @@
             GROUP BY tx.dealer_id
         )xx ON t.dealer_id = xx.dealer_id
         <where>
-             soi.sales_batch_id != 'KS00000000000001' AND soi.sales_customer_id IS NULL
+             soi.sales_batch_id != 'KS00000000000001'
+            AND sales_status = 1
+            AND sales_shipping_status = 1
+            AND soi.sales_customer_id IS NULL
             <if test="startDate != null and startDate != ''">
                 AND soi.sales_create_time <![CDATA[>=]]> #{startDate}
             </if>

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

@@ -330,6 +330,30 @@ public class FinanciaReceController {
     }
 
     /**
+     * to查看订单
+     * @return
+     * @author
+     * @date
+     */
+    @RequiresPermissions("dm:FinancialReceipt:orderDesc")
+    @RequestMapping("/to_order_desc_info")
+    public ModelAndView toOrderDescInfo(HttpServletRequest request,Integer frId) {
+        ModelAndView mv = new ModelAndView("dm/financialReceipt/order_desc_info");
+        mv.addObject("frId",frId);
+        FinancialReceipt fr = financialReceiptService.getFinancialReceiptById(frId);
+        mv.addObject("fr",fr);
+
+        ClaimOrder claimOrder = new ClaimOrder();
+        claimOrder.setFrId(frId);
+        List<ClaimOrder> claimOrderList = claimOrderService.getClaimOrderList(claimOrder);
+        mv.addObject("claimOrderList",claimOrderList);
+
+        Admin admin = AdminUtils.getLoginAdmin();
+        mv.addObject("admin",admin);
+        return mv;
+    }
+
+    /**
      * 绑定订单
      * @param request
      * @return

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

@@ -154,15 +154,15 @@
                                 </#if>
 
 
-                                <#if financialReceipt.frClaimStatus == 3 && admin.adminDept == 5>
-                                    <a style="text-decoration:none" href="javascript:void(0);" title="查看订单" onclick="toOrderDesc(${financialReceipt.frId!''})">
+                                <#if financialReceipt.frClaimStatus == 3 >
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="查看订单" onclick="toOrderDescInfo(${financialReceipt.frId!''})">
                                         <font color=#06c>查看订单</font>
                                     </a>
                                 </#if>
 
 
                                 <#if financialReceipt.frClaimStatus == 2 && admin.adminDept == 1>
-                                   <a style="text-decoration:none;" href="javascript:void(0);" title="删除" onclick="deleteFr(${financialReceipt.frId!''})">
+                                   <a style="text-decoration:none; display: none;" href="javascript:void(0);" title="删除" onclick="deleteFr(${financialReceipt.frId!''})">
                                        <font color=#06c>删除</font>
                                    </a>
                                </#if>
@@ -207,6 +207,13 @@
     }
 
     /**
+     * 查询订单
+     */
+    function toOrderDescInfo(frId){
+        window.location.href= "${path}/admin/financial_receipt/to_order_desc_info?frId="+frId;
+    }
+
+    /**
      * 跳转到认款
      */
     function claimDelaer(frId,type){
@@ -247,6 +254,7 @@
      * 取消认款
      */
     function deleteFr(frId){
+
             $.ajax({
                 type: "POST",
                 data: {

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

@@ -46,6 +46,7 @@
                 <th width="60">客户名称</th>
                 <th width="80">销售渠道</th>
                 <th width="50">订单总额</th>
+                <th width="50">订单总成本</th>
                 <th width="65">已认领金额</th>
                 <#--<th width="50">操作</th>-->
             </tr>
@@ -60,6 +61,7 @@
                          ${dmDealer.dealChannelName!''}
                     </td>
                     <td>${(dmDealer.itemTotal)!'0'}</td>
+                    <td>${(dmDealer.itemCostTotal)!'0'}</td>
                     <td>${(dmDealer.claimOrderTotal)!'0'}</td>
 <#--
                     <td>

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

@@ -0,0 +1,384 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
+    <meta http-equiv="Cache-Control" content="no-siteapp"/>
+<#include "/base/add_base.ftl">
+    <link rel="stylesheet" type="text/css" href="${path}/common/lib/layui/css/layui.css" />
+    <style>
+        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
+        .ac_results li {border:1px solid #fff}
+        .ac_results li a span {float:right}
+        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
+        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
+        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
+        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
+        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
+        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
+        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
+        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
+        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
+        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
+        .time-line-list>li:first-child .arrow{display: none;}
+        .table-bg th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .msg-phone{height: 35px;line-height: 35px;}
+        .col-sm-1{width: 150px;}
+
+        .all_down{text-decoration: underline;color: #00c;}
+    </style>
+    <title>绑定订单 - 财务管理 - RST</title>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">/</span> 财务管理
+    <span class="c-gray en">/</span> 绑定订单
+    <a class="btn radius r"
+       href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+    <a class="btn radius r"
+       href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
+</nav>
+<article class="page-container" style="padding: 10px;">
+    <div class="pd-20 cl" style="padding-top: 0px;">
+        <form action="${path}/admin/financial_receipt/claim_order" method="post" class="form form-horizontal" id="form-fr"  onkeydown="if(event.keyCode==13)return false;">
+
+            <input type="hidden" id="frId" name="frId" value="${fr.frId!'0'}">
+            <input type="hidden" id="dealerId" name="dealerId" value="${fr.dealerId!'0'}">
+            <input type="hidden" id="claimOrderJson" name="claimOrderJson" value="">
+
+            <div class="row cl">
+                <label class="form-label col-3">
+                    <div class="tit-2">回款信息</div>
+                </label>
+                <div class="formControls col-9">
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-1 col-sm-1">所属客户：</label>
+                <div class="formControls col-5 col-sm-5" style="padding-top: 3px;">
+                    ${fr.dealerName!''}
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-1 col-sm-1">回款账号：</label>
+                <div class="formControls col-5 col-sm-5" style="padding-top: 3px;">
+                    ${fr.frBank!''}
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-1 col-sm-1">回款金额：</label>
+                <div class="formControls col-5 col-sm-5" style="padding-top: 3px;">
+                    ${((fr.frAmount/100)?string("0.##"))!''}
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <label class="form-label col-1 col-sm-1">打款备注：</label>
+                <div class="formControls col-5 col-sm-5" style="padding-top: 3px;">
+                    ${fr.frBank!''}
+                </div>
+            </div>
+
+
+            <div class="row cl">
+                <label class="form-label col-3">
+                    <div class="tit-2">订单信息</div>
+                </label>
+                <div class="formControls col-9">
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <div class="formControls col-12 col-sm-12" >
+                    <table class="table table-border table-bordered table-bg table-hover table-sort">
+                        <thead>
+                        <tr class="text-c">
+                            <th>待结算金额</th>
+                            <th>交易号</th>
+                            <th>所属店铺</th>
+                            <th>产品</th>
+                            <th>颜色</th>
+                            <th>总金额</th>
+                            <th>数量</th>
+                            <th>下单日期</th>
+                            <th>下单客服</th>
+                            <th>收货人信息</th>
+                            <th>收货人地址</th>
+                            <th>操作</th>
+                        </tr>
+                        </thead>
+                        <tbody id="orderAll">
+                            <#if claimOrderList?? &&  (claimOrderList?size > 0) >
+                                <#list claimOrderList as claimOrder>
+                                    <#if claimOrder.claimOrderType == 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>
+                                            <td>${claimOrder.salesDealCode!''}</td>
+                                            <td>${claimOrder.storeName!''}</td>
+                                            <td>${claimOrder.itemProductName!''}</td>
+                                            <td>${claimOrder.itemProductColor!''}</td>
+                                            <td>${((claimOrder.frPrice/100)?string("0.##"))!''}</td>
+                                            <td class="itemNum">${claimOrder.claimOrderNum!'0'}</td>
+                                            <td>${(claimOrder.salesPayTime?string("yyyy-MM-dd"))!''}</td>
+                                            <td>${claimOrder.salesAdminName!''}</td>
+                                            <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)}...
+                                                <#else>
+                                                ${claimOrder.salesAddressInfo!''}
+                                                </#if>
+                                            </td>
+                                            <td>-</td>
+                                        </tr>
+                                    </#if>
+                                </#list>
+                            </#if>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="row cl">
+                <label class="form-label col-3">
+                    <div class="tit-2">退货信息</div>
+                </label>
+                <div class="formControls col-9">
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <div class="formControls col-12 col-sm-12" >
+                    <table class="table table-border table-bordered table-bg table-hover table-sort">
+                        <thead>
+                            <tr class="text-c">
+                                <th>待结算金额</th>
+                                <th>交易号</th>
+                                <th>所属店铺</th>
+                                <th>产品</th>
+                                <th>颜色</th>
+                                <th>总金额</th>
+                                <th>产品数量</th>
+                                <th>退货数量</th>
+                                <th>下单日期</th>
+                                <th>下单客服</th>
+                                <th>收货人信息</th>
+                                <th>收货人地址</th>
+                                <th>操作</th>
+                            </tr>
+                        </thead>
+                        <tbody id="returnAll">
+                            <#if claimOrderList?? &&  (claimOrderList?size > 0) >
+                                <#list claimOrderList as claimOrder>
+                                    <#if claimOrder.claimOrderType == 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>
+                                            <td>${claimOrder.salesDealCode!''}</td>
+                                            <td>${claimOrder.storeName!''}</td>
+                                            <td>${claimOrder.itemProductName!''}</td>
+                                            <td>${claimOrder.itemProductColor!''}</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>
+                                            <td>${claimOrder.salesAdminName!''}</td>
+                                            <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)}...
+                                                <#else>
+                                                    ${claimOrder.salesAddressInfo!''}
+                                                </#if>
+                                            </td>
+                                            <td>-</td>
+                                        </tr>
+                                    </#if>
+                                </#list>
+                            </#if>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="row cl">
+                <label class="form-label col-3">
+                    <div class="tit-2">退货邮费</div>
+                </label>
+                <div class="formControls col-9">
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="">
+                <div class="formControls col-12 col-sm-12" >
+                    <table class="table table-border table-bordered table-bg table-hover table-sort">
+                        <thead>
+                        <tr class="text-c">
+                            <th width="30">待结算金额</th>
+                            <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="postageAll">
+                        <#if claimOrderList?? &&  (claimOrderList?size > 0) >
+                            <#list claimOrderList as claimOrder>
+                                <#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>
+                                            -
+                                        </td>
+                                    </tr>
+                                </#if>
+                            </#list>
+                        </#if>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="row cl" id="" style="margin-left: 16px;font-weight: bold;">
+                <p class=""  id="">
+                <#--    共<span id="allNormalProduct">0</span>个正常产品，
+                    <span id="allReturnProduct">0</span>个退货产品，-->
+                    待结算总金额：<span id="allAmount">0</span>
+                </p>
+            </div>
+
+        </form>
+    </div>
+</article>
+<#-- 业务脚本JS -->
+<script type="text/javascript">
+    var url_path = "${path}";
+</script>
+<script type="text/javascript">
+    $('.skin-minimal input').iCheck({
+        checkboxClass: 'icheckbox-blue',
+        radioClass: 'iradio-blue',
+        increaseArea: '20%'
+    });
+
+    var itemNum = 0;
+
+    var isAddOrderType = 1; //1:添加普通订单   2：添加退货订单
+
+    $(function () {
+        calculaAllAmount();
+
+        $('.order_item').find(".itemReturnNum").change(function () {
+            var $item = $(this).parents('tr');
+            var itemReturnNum = $(this).val();
+            var itemProductDiscount = $item.find(".itemProductDiscount").val();
+            if(parseInt(itemReturnNum) > 0){
+                $item.find(".itemTotal").css("color","red");
+                $item.find(".itemTotal").text( accMul(-itemReturnNum,itemProductDiscount));
+            }else{
+                $item.find(".itemTotal").css("color","#000");
+                $item.find(".itemTotal").text(0);
+            }
+            //计算总金额
+            calculaAllAmount();
+        })
+    })
+
+
+    /**
+     * 计算总金额
+     */
+    function calculaAllAmount(){
+        var total = 0;
+        var allNormalProduct = 0;
+        var allReturnProduct = 0;
+        $(".order_item").each(function () {
+            var itemTotal = $(this).find(".itemTotal").text();
+            itemTotal = Number(itemTotal);
+            if($(this).attr("orderItem") == 1){
+                total = accAdd(total,itemTotal);
+                var itemNum = $(this).find(".itemNum").text();
+               // 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);
+            }
+        });
+        $("#allAmount").text(total);
+//        $("#allNormalProduct").text(allNormalProduct);
+//        $("#allReturnProduct").text(allReturnProduct);
+    }
+
+
+    /**
+     * 删除table中的tr
+     */
+    function deleteTableByTr_orderDesc($this) {
+        $this.parents("tr").remove();
+        calculaAllAmount();
+    }
+
+
+</script>
+
+
+</body>
+</html>

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

@@ -87,7 +87,7 @@
                         </span>
                     </div>
 
-                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" > <span class="select-box">
+                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;display: none" > <span class="select-box">
                         <select name="salesStatus" class="select" id="salesStatus"  >
                              <option value="">状态</option>
                              <option value="0" <#if salesOrder.salesStatus?? ><#if salesOrder.salesStatus == 0 >selected</#if></#if>>未确认</option>
@@ -99,6 +99,15 @@
                      </div>
 
                      <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" > <span class="select-box">
+                        <select name="salesReturnGoods" class="select" id="salesReturnGoods"  >
+                             <option value="">是否含有退货</option>
+                             <option value="1" <#if salesOrder.salesReturnGoods?? ><#if salesOrder.salesReturnGoods == 1 >selected</#if></#if>>无退货</option>
+                             <option value="2" <#if salesOrder.salesReturnGoods?? ><#if salesOrder.salesReturnGoods == 2 >selected</#if></#if>>有退货</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="orderIscostTotal" class="select" id="orderIscostTotal"  >
                              <option value ="">是否认领</option>
                              <option <#if (salesOrder.orderIscostTotal)??><#if salesOrder.orderIscostTotal == 1>selected="selected"</#if></#if> value ="1" >已认领</option>
@@ -234,6 +243,7 @@
         var salesOrderId = cufte($("#salesOrderId").val());
         var colorId = cufte($("#colorId").val());
         var orderIscostTotal = cufte($("#orderIscostTotal").val());
+        var salesReturnGoods = cufte($("#salesReturnGoods").val());
         var startDate = cufte($("#startDate").val());
         var endDate = cufte($("#endDate").val());
         $.ajax({
@@ -251,6 +261,7 @@
                 orderIscostTotal : orderIscostTotal,
                 isCustmerAddOrder : 2,
                 isSelectCustomer : 2,
+                salesReturnGoods : salesReturnGoods,
                 startDate : startDate,
                 endDate : endDate,
                 orderDateType : 1,
@@ -266,17 +277,15 @@
                         var disHtml =  "";
                         var productsHtml = '';
                         var salesOrderItem = salesOrder.salesOrderItemList;
+                        var orderStatus = "正常"; //是否退货
                         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(salesOrderItem[j].itemReturnNum > 0){
+                                orderStatus = "退货";
+                            }
                         }
                         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;
-                        }
 
                         if(salesOrder.salesStatus != 1){
                             disHtml = 'disabled="disabled" title="只能选择已确认的订单" ';