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

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

@@ -95,6 +95,11 @@ public class CustomerCommon implements Serializable {
     private String salesOrderId;
     //是否需要添加订单
     private Integer isNeedSelectOrder;
+
+    //工厂维修报价
+    private Integer relationFactoryCosts;
+    //客户报价
+    private Integer relationCustomerCosts;
     //签收时间
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date relationBackReceiptDate;
@@ -448,4 +453,20 @@ public class CustomerCommon implements Serializable {
     public void setSalesOrderList(List<SalesOrder> salesOrderList) {
         this.salesOrderList = salesOrderList;
     }
+
+    public Integer getRelationFactoryCosts() {
+        return relationFactoryCosts;
+    }
+
+    public void setRelationFactoryCosts(Integer relationFactoryCosts) {
+        this.relationFactoryCosts = relationFactoryCosts;
+    }
+
+    public Integer getRelationCustomerCosts() {
+        return relationCustomerCosts;
+    }
+
+    public void setRelationCustomerCosts(Integer relationCustomerCosts) {
+        this.relationCustomerCosts = relationCustomerCosts;
+    }
 }

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

@@ -75,6 +75,10 @@ public class Repair implements Serializable {
     private Date repairCreateTime;
     //  修改时间 ,
     private Date repairUpdateTime;
+    //工厂维修报价
+    private Integer repairFactoryCosts;
+    //客户报价
+    private Integer repairCustomerCosts;
     //  签收日期 ,
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date repairBackReceiptDate;
@@ -504,4 +508,20 @@ public class Repair implements Serializable {
     public void setRepairBackReceiptDate(Date repairBackReceiptDate) {
         this.repairBackReceiptDate = repairBackReceiptDate;
     }
+
+    public Integer getRepairFactoryCosts() {
+        return repairFactoryCosts;
+    }
+
+    public void setRepairFactoryCosts(Integer repairFactoryCosts) {
+        this.repairFactoryCosts = repairFactoryCosts;
+    }
+
+    public Integer getRepairCustomerCosts() {
+        return repairCustomerCosts;
+    }
+
+    public void setRepairCustomerCosts(Integer repairCustomerCosts) {
+        this.repairCustomerCosts = repairCustomerCosts;
+    }
 }

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

@@ -101,7 +101,9 @@
       repair_create_time,
       repair_update_time,
       repair_alipay_name,
-      repair_back_receipt_date
+      repair_back_receipt_date,
+      repair_factory_costs,
+      repair_customer_costs
     from
       tb_rst_repair
     <where>
@@ -148,6 +150,8 @@
     <result column="repair_create_time" property="repairCreateTime"/>
     <result column="repair_update_time" property="repairUpdateTime"/>
     <result column="repair_back_receipt_date" property="repairBackReceiptDate"/>
+    <result column="repair_factory_costs" property="repairFactoryCosts"/>
+    <result column="repair_customer_costs " property="repairCustomerCosts"/>
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 
@@ -193,7 +197,7 @@
       area_number, repair_send_merge_address, repair_send_address, 
       repair_send_logistics_company, repair_send_logistics_no, 
       repair_desc, repair_state, repair_alipay, repair_alipay_name,
-      repair_is_transfer
+      repair_is_transfer,repair_factory_costs,repair_customer_costs
       )
     values (#{customerId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
       #{signclosedId,jdbcType=INTEGER}, #{repairBackEfastOrderId,jdbcType=VARCHAR}, #{repairBackStatus,jdbcType=BIT}, 
@@ -204,7 +208,7 @@
       #{areaNumber,jdbcType=VARCHAR}, #{repairSendMergeAddress,jdbcType=VARCHAR}, #{repairSendAddress,jdbcType=VARCHAR}, 
       #{repairSendLogisticsCompany,jdbcType=VARCHAR}, #{repairSendLogisticsNo,jdbcType=VARCHAR}, 
       #{repairDesc,jdbcType=VARCHAR}, #{repairState,jdbcType=BIT}, #{repairAlipay,jdbcType=VARCHAR}, #{repairAlipayName,jdbcType=VARCHAR},
-      #{repairIsTransfer,jdbcType=BIT}
+      #{repairIsTransfer,jdbcType=BIT},#{repairFactoryCosts,jdbcType=INTEGER},#{repairCustomerCosts,jdbcType=INTEGER}
       )
   </insert>
 
@@ -299,6 +303,12 @@
       <if test="repairBackReceiptDate != null" >
         repair_back_receipt_date = #{repairBackReceiptDate},
       </if>
+      <if test="repairFactoryCosts != null" >
+        repair_factory_costs = #{repairFactoryCosts},
+      </if>
+      <if test="repairCustomerCosts != null" >
+        repair_customer_costs  = #{repairCustomerCosts}
+      </if>
     </set>
     where repair_id = #{repairId}
   </update>

watero-rst-service/src/main/java/com/iamberry/rst/util/CustomerCommonUtil.java

@@ -76,6 +76,8 @@ public class CustomerCommonUtil {
                 repair.setRepairIsTransfer(c.getRelationIsTransfer());
                 repair.setRepairCreateTime(c.getRelationCreateTime());
                 repair.setRepairUpdateTime(c.getRelationUpdateTime());
+                repair.setRepairFactoryCosts(c.getRelationFactoryCosts()*100);
+                repair.setRepairCustomerCosts(c.getRelationCustomerCosts()*100);
                 return repair;
             case 5://补发
                 Reissue reissue = new Reissue();
@@ -226,6 +228,8 @@ public class CustomerCommonUtil {
                 customerCommon.setRelationUpdateTime(repair.getRepairUpdateTime());
                 customerCommon.setMaintenanceIsRepair(repair.getMaintenanceIsRepair());
                 customerCommon.setDetectState(repair.getDetectState());
+                customerCommon.setRelationFactoryCosts(repair.getRepairFactoryCosts()== null ? null: repair.getRepairFactoryCosts()/100);
+                customerCommon.setRelationCustomerCosts(repair.getRepairCustomerCosts() == null ? null:repair.getRepairCustomerCosts()/100);
                 break;
             case 5://补发
                 Reissue reissue = (Reissue)object;

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

@@ -526,7 +526,16 @@
                     &nbsp;&nbsp;&nbsp;&nbsp;<span id="DTS-in"></span>&nbsp;&nbsp;  <span id="DTS-out"></span>
                 </div>
             </div>
-
+            <div class="row cl" id="customerCostsDiv" style="display: none;">
+                  <label class="form-label col-1 col-sm-1">工厂报价：</label>
+                  <div class="col-2 col-sm-2">
+                     <input type="text" class="input-text trim_input" placeholder="工厂报价" id="relationFactoryCosts" name="relationFactoryCosts" value="">
+                  </div>
+                  <label class="form-label col-1 col-sm-1">给客户报价：</label>
+                  <div class="col-2 col-sm-2">
+                    <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="">
+                  </div>
+            </div>
             <div class="row cl" id="sendAddressInfo">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄回信息：</label>
                 <div class="formControls col-5 col-sm-5" style="height: 240px" id="sendAddressSmsHtml">

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

@@ -654,6 +654,17 @@
                     &nbsp;&nbsp;&nbsp;&nbsp;<span id="DTS-in"><#if customerInfo.customerInTDS??>进水：${customerInfo.customerInTDS} PPM</#if></span>&nbsp;&nbsp;  <span id="DTS-out"><#if customerInfo.customerOutTDS??>出水：${customerInfo.customerOutTDS} PPM</#if></span>
                 </div>
             </div>
+            <div class="row cl" id="customerCostsDiv" style="display: none;">
+                            <label class="form-label col-1 col-sm-1">工厂报价：</label>
+                    <div class="col-2 col-sm-2">
+                            <input type="text" class="input-text trim_input" placeholder="工厂报价" id="relationFactoryCosts" name="relationFactoryCosts" value="${customerCommon.relationFactoryCosts!''}">
+                            </div>
+                            <label class="form-label col-1 col-sm-1">给客户报价：</label>
+                    <div class="col-2 col-sm-2">
+                  <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="${customerCommon.relationCustomerCosts!''}">
+               </div>
+            </div>
+
             <div class="row cl" id="sendAddressInfo">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄回信息：</label>
                 <div class="formControls col-5 col-sm-5" style="height: 250px" id="sendAddressSmsHtml">

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

@@ -138,6 +138,14 @@
                         <input type="text" placeholder="请选择仓库签收时间" id="repairBackReceiptDate"  name="repairBackReceiptDate" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})"  readonly="readonly" seleType="send">
                     </div>
                 </div>
+                <#--<div class="row cl" style="position: relative;/*display: none;*/">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>维修费用</strong>
+                    </div>
+                    <div class="formControls col-4 col-sm-4">
+                        <input type="text" id="repairCosts" placeholder="维修费用" name="repairCosts" datatype="*" class="input-text"  seleType="send">
+                    </div>
+                </div>-->
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2">
                     </div>
@@ -696,6 +704,9 @@
                     $('#repairSendAddress').val(repair.repairSendAddress);
                     $('#repairSendLogisticsNo').val(repair.repairSendLogisticsNo);
                     $('#repairDesc').val(repair.repairDesc);
+                    /*if(repair.repairCosts != null){
+                        $('#repairCosts').val(repair.repairCosts/100);
+                    }*/
                     $('#repairBackReceiptDate').val(formatDate(repair.repairBackReceiptDate));
 
                     var detect_table = $('#detect_table');
@@ -779,6 +790,9 @@
         //寄回邮费
         var repairBackPostage = $("#repairBackPostage").val();
         $("#repairBackPostage").val(parseInt(repairBackPostage*100));
+        //维修费用
+        /*var repairCosts = $("#repairCosts").val();
+        $("#repairCosts").val(parseInt(repairCosts*100));*/
         var obj = null;
         if(type == 1){
             obj = getseleType("send");
@@ -820,6 +834,7 @@
         var repairBackLogisticsCompany = $("#repairBackLogisticsCompany option:selected").val();//寄回物流公司
         var repairBackName = $('#repairBackName').val();//寄件人姓名
         var repairBackTel = $('#repairBackTel').val();//寄件人电话
+        /*var repairCosts = $('#repairCosts').val();*/
         if(type == 1){
             if (repairBackStatus == 1) {
 //            if (repairBackLogisticsNo != null && repairBackLogisticsNo != '') {
@@ -868,6 +883,11 @@
                     repair_flag = false;
                     return repair_flag;
                 }
+                /*if (!money.test(repairCosts)) {
+                    layer.msg("维修费用格式不正确，请重新输入!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }*/
             }
             if (repairBackStatus == 3) {
                 var repairBackReceiptDate = $('#repairBackReceiptDate').val();//仓库签收时间

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_detail.ftl

@@ -62,28 +62,28 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">订单编号：</label>
-            <div class="formControls col-4 col-sm-4">
-                <label>${order.salesOrderId!''}</label>
+            <label class="form-label col-2 col-sm-2">订单编号：</label>
+            <div class="formControls col-3 col-sm-3">
+                <label>${order.salesOrderId!'暂无订单编号'}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">交易号：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">交易号：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesDealCode!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">销售公司：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">销售公司：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.companyName!''}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">店铺：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">店铺：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.storeName!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">是否支付：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">是否支付：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>
                 <#if order.salesPayStatus == 0>
                     未付款
@@ -92,8 +92,8 @@
                 </#if>
                 </label>
             </div>
-            <label class="form-label col-1 col-sm-1">是否发货：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">是否发货：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>
                     <#if order.salesShippingStatus == 0>
                         未发货
@@ -106,100 +106,113 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">订单金额：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">订单金额（￥）：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesAmount/100!''}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">支付金额：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">支付金额（￥）：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesPayMoney/100!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">付款方式：</label>
-            <div class="formControls col-4 col-sm-4">
+
+            <label class="form-label col-2 col-sm-2">邮费（￥）：</label>
+            <div class="formControls col-3 col-sm-3">
+                <label>${order.salesShippingFee/100!''}</label>
+            </div>
+            <label class="form-label col-2 col-sm-2">付款方式：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>
-                    <#if order.salesPayType == 1>
-                        微信支付
-                    <#elseif order.salesPayType == 2>
-                        现金支付
-                    <#elseif order.salesPayType == 3>
-                        已支付定金￥99
-                    <#elseif order.salesPayType == 4>
-                        刷卡支付
-                    <#elseif order.salesPayType == 5>
-                        支付宝支付
-                    </#if>
+                <#if order.salesPayType == 1>
+                    微信支付
+                <#elseif order.salesPayType == 2>
+                    现金支付
+                <#elseif order.salesPayType == 3>
+                    已支付定金￥99
+                <#elseif order.salesPayType == 4>
+                    刷卡支付
+                <#elseif order.salesPayType == 5>
+                    支付宝支付
+                </#if>
                 </label>
             </div>
-            <label class="form-label col-1 col-sm-1">支付时间：</label>
-            <div class="formControls col-4 col-sm-4">
+
+        </div>
+        <div class="row cl">
+            <label class="form-label col-2 col-sm-2">支付时间：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${(order.salesPayTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
             </div>
+            <label class="form-label col-2 col-sm-2">发货时间：</label>
+            <div class="formControls col-3 col-sm-3">
+                <label>${(order.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!'暂未发货'}</label>
+            </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1"><#--发货时间：--></label>
-            <div class="formControls col-4 col-sm-4">
-                <label>${(order.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
+            <label class="form-label col-3">
+                <div class="tit-2">
+                    购买产品
+                </div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
             </div>
-            <label class="form-label col-1 col-sm-1">邮费：</label>
-            <div class="formControls col-4 col-sm-4">
-                <label>${order.salesShippingFee/100!''}</label>
+        </div>
+        <div class="row cl">
+            <label class="form-label col-2 col-sm-2">购买产品信息：</label>
+            <div class="formControls col-7 col-sm-7 text-c">
+                <table class="table table-border table-bg table-bordered">
+                    <tr class="text-c">
+                        <th>产品名称</th>
+                        <th>产品颜色</th>
+                        <#--<th>产品图片</th>-->
+                        <th>产品市场价（￥）</th>
+                        <th>产品折扣价（￥）</th>
+                        <th>产品数量</th>
+                    </tr>
+                    <#if order.salesOrderItemList?? &&  (order.salesOrderItemList?size > 0) >
+                        <#list order.salesOrderItemList as item>
+                            <tr class="text-c">
+                                <td>${item.itemProductName!''}</td>
+                                <td>${item.itemProductColor!''}</td>
+                                <#--<td>${item.itemProductPic!''}</td>-->
+                                <td>${item.itemProductPrice/100!''}</td>
+                                <td>${item.itemProductDiscount/100!''}</td>
+                                <td>${item.itemNum}</td>
+                            </tr>
+                        </#list>
+                    </#if>
+                </table>
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-3">
                 <div class="tit-2">
-                    购买产品
+                    邮寄信息
                 </div>
             </label>
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <#--<div class="row cl">-->
-            <#--<label class="form-label col-1 col-sm-1">购买产品信息</label>-->
-            <#--<div class="formControls col-7 col-sm-7 text-c">-->
-                <#--<table class="table table-border table-bg table-bordered">-->
-                    <#--<tr class="text-c">-->
-                        <#--<th>产品名称</th>-->
-                        <#--<th>产品颜色</th>-->
-                        <#--<th>产品市场价</th>-->
-                        <#--<th>产品折扣价</th>-->
-                        <#--<th>产品数量</th>-->
-                    <#--</tr>-->
-                    <#--<#if order.salesOrderItemList?? &&  (order.salesOrderItemList?size > 0) >-->
-                        <#--<#list order.salesOrderItemList as item>-->
-                            <#--<tr class="text-c">-->
-                                <#--<td>${item.itemProductName!''}</td>-->
-                                <#--<td>${item.itemProductColor!''}</td>-->
-                                <#--<td>${item.itemProductPrice/100!''}</td>-->
-                                <#--<td>${item.itemProductDiscount/100!''}</td>-->
-                                <#--<td>${item.itemNum}</td>-->
-                            <#--</tr>-->
-                        <#--</#list>-->
-                    <#--</#if>-->
-                <#--</table>-->
-            <#--</div>-->
-        <#--</div>-->
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">收货人姓名：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">收货人姓名：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesAddressName!''}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">收货人电话：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">收货人电话：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesAddressTel!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">收货人地址：</label>
+            <label class="form-label col-2 col-sm-2">收货人地址：</label>
             <div class="formControls col-9 col-sm-9">
                 <label>${order.salesAddressInfo!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">快递公司：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">快递公司：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>
                 <#if order.salesPostFirm??>
                     <#if order.salesPostFirm == 'sto'>
@@ -240,18 +253,18 @@
                 </#if>
                 </label>
             </div>
-            <label class="form-label col-1 col-sm-1">快递单号：</label>
-            <div class="formControls col-4 col-sm-4">
-                <label>${order.salesPostNum!''}</label>
+            <label class="form-label col-2 col-sm-2">快递单号：</label>
+            <div class="formControls col-3 col-sm-3">
+                <label>${order.salesPostNum!'暂无快递单号'}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">用户备注：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">用户备注：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesUserRemark!''}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">创建时间：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">创建时间：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${(order.salesCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
             </div>
         </div>

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

@@ -435,7 +435,7 @@ function initProcessResult(type,allCustomerInfoType){
         $("#reissue").hide();
         $("#backGoods").hide();
         $("#noReasonBack").hide();
-
+        $("#customerCostsDiv").hide();
         switch(type)
         {
             case 1:
@@ -452,7 +452,7 @@ function initProcessResult(type,allCustomerInfoType){
                 break;
         }
     }else if(allCustomerInfoType == 2){ //售后
-
+        $("#customerCostsDiv").hide();
         if(!isInitSendAddressSms){
             initComplaintQuestionInfo("m");
             isInitSendAddressSms = true;
@@ -541,6 +541,7 @@ function initProcessResult(type,allCustomerInfoType){
                     $("#salesChannelsSelect").show();  //展示销售公司
                     $("#TDScollect").show();
                 }
+                $("#customerCostsDiv").show();
                 break;
             case 5://补发
                 result = isSolve.reissue;
@@ -569,6 +570,7 @@ function initProcessResult(type,allCustomerInfoType){
                     $("#salesChannelsSelect").show();  //展示销售公司
                     $("#TDScollect").show();
                 }
+                $("#customerCostsDiv").hide();
                 break;
             case 6: //退货
                 result = isSolve.backGoods;
@@ -597,6 +599,7 @@ function initProcessResult(type,allCustomerInfoType){
                     $("#salesChannelsSelect").show();  //展示销售公司
                     $("#TDScollect").show();
                 }
+                $("#customerCostsDiv").hide();
                 break;
             case 7://无理由退货
                 result = isSolve.noReasonBack;
@@ -625,6 +628,7 @@ function initProcessResult(type,allCustomerInfoType){
                     $("#salesChannelsSelect").show();  //展示销售公司
                     $("#TDScollect").show();
                 }
+                $("#customerCostsDiv").hide();
                 break;
             default:
                 break;