增加售后规则查看功能

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

@@ -0,0 +1,91 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+
+/**
+ * Created by Administrator on 2019/3/8.
+ */
+public class InformationInfo implements Serializable{
+    private static final long serialVersionUID = 2422002050608696730L;
+    private Integer feeId;//
+    private Integer relationId;//处理id
+    private Integer feeCharges;//收费金额
+    private Integer feeOriginally;//收费原由1：以旧换新   2：机器维修 3：机器运费
+    private Integer feePayChannel;//支付渠道1：微信   2：支付宝 3：银行卡
+    private Integer feePayAccount;//支付账号
+    private Integer feeStatus;//状态1代付款，2已收款
+    private Integer feeDesc;//
+    private Integer feeCreateTime;
+
+    public Integer getFeeId() {
+        return feeId;
+    }
+
+    public void setFeeId(Integer feeId) {
+        this.feeId = feeId;
+    }
+
+    public Integer getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Integer relationId) {
+        this.relationId = relationId;
+    }
+
+    public Integer getFeeCharges() {
+        return feeCharges;
+    }
+
+    public void setFeeCharges(Integer feeCharges) {
+        this.feeCharges = feeCharges;
+    }
+
+    public Integer getFeeOriginally() {
+        return feeOriginally;
+    }
+
+    public void setFeeOriginally(Integer feeOriginally) {
+        this.feeOriginally = feeOriginally;
+    }
+
+    public Integer getFeePayChannel() {
+        return feePayChannel;
+    }
+
+    public void setFeePayChannel(Integer feePayChannel) {
+        this.feePayChannel = feePayChannel;
+    }
+
+    public Integer getFeePayAccount() {
+        return feePayAccount;
+    }
+
+    public void setFeePayAccount(Integer feePayAccount) {
+        this.feePayAccount = feePayAccount;
+    }
+
+    public Integer getFeeStatus() {
+        return feeStatus;
+    }
+
+    public void setFeeStatus(Integer feeStatus) {
+        this.feeStatus = feeStatus;
+    }
+
+    public Integer getFeeDesc() {
+        return feeDesc;
+    }
+
+    public void setFeeDesc(Integer feeDesc) {
+        this.feeDesc = feeDesc;
+    }
+
+    public Integer getFeeCreateTime() {
+        return feeCreateTime;
+    }
+
+    public void setFeeCreateTime(Integer feeCreateTime) {
+        this.feeCreateTime = feeCreateTime;
+    }
+}

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

@@ -135,6 +135,8 @@ public class SalesOrder implements Serializable {
     private String procMethodName;
 
    private Integer salesWarehouseId;//所属仓库id
+
+   private Integer isDevelop;//产品项是否包含有水机 1是 2否
  public Integer getStartOrderNO() {
        return startOrderNO;
     }
@@ -781,4 +783,12 @@ public class SalesOrder implements Serializable {
     public void setIsSalesCustomerId(Integer isSalesCustomerId) {
         this.isSalesCustomerId = isSalesCustomerId;
     }
+
+    public Integer getIsDevelop() {
+        return isDevelop;
+    }
+
+    public void setIsDevelop(Integer isDevelop) {
+        this.isDevelop = isDevelop;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -335,4 +335,29 @@ public interface CustomerService {
      * 查询寄回产品集合
      */
     List<ClosedProdcue> listclosedProdcue(ClosedProdcue closedProdcue);
+
+    /**
+     * 根据收费信息id查询收费信息
+     */
+    InformationInfo getInformationInfo(Integer feeId);
+
+    /**
+     * 根据处理id查询收费信息
+     */
+    List<InformationInfo> listInformationInfo(Integer relationId);
+
+    /**
+     * 添加收费信息
+     */
+    Integer addInformationInfo(InformationInfo informationInfo);
+
+    /**
+     * 修改收费信息
+     */
+    Integer updateInformationInfo(InformationInfo informationInfo);
+
+    /**
+     * 删除收费信息
+     */
+    Integer delInformationInfo(Integer feeId);
 }

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

@@ -1765,4 +1765,29 @@ public class CustomerServiceImpl implements CustomerService {
     public List<ClosedProdcue> listclosedProdcue(ClosedProdcue closedProdcue) {
         return closedProdcueMapper.listclosedProdcue(closedProdcue);
     }
+
+    @Override
+    public InformationInfo getInformationInfo(Integer feeId) {
+        return customerInfoMapper.getInformationInfo(feeId);
+    }
+
+    @Override
+    public List<InformationInfo> listInformationInfo(Integer relationId) {
+        return customerInfoMapper.listInformationInfo(relationId);
+    }
+
+    @Override
+    public Integer addInformationInfo(InformationInfo informationInfo) {
+        return customerInfoMapper.addInformationInfo(informationInfo);
+    }
+
+    @Override
+    public Integer updateInformationInfo(InformationInfo informationInfo) {
+        return customerInfoMapper.updateInformationInfo(informationInfo);
+    }
+
+    @Override
+    public Integer delInformationInfo(Integer feeId) {
+        return customerInfoMapper.delInformationInfo(feeId);
+    }
 }

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

@@ -138,6 +138,17 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             SalesOrderItem salesOrderItem = new SalesOrderItem();
             salesOrderItem.setItemOrderId(so.getSalesId());
             List<SalesOrderItem> salesOrderItemList = salesOrderMapper.listSalesOrderItem(salesOrderItem);
+            for(SalesOrderItem item : salesOrderItemList){//判断是否包含净水机 1是 2否
+                if(item.getColorIsMachine() != null){
+                    if(item.getColorIsMachine() == 1){
+                        so.setIsDevelop(1);
+                    }else{
+                        so.setIsDevelop(2);
+                    }
+                }else{
+                    so.setIsDevelop(1);
+                }
+            }
             so.setSalesOrderItemList(salesOrderItemList);
         }
         PagedResult<SalesOrder> result = PageUtil.getPage(orderList);

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

@@ -196,4 +196,29 @@ public interface CustomerInfoMapper {
      */
     Integer deleteSendbackItemBySendbackId(Integer sendbackId);
 
+    /**
+     * 根据收费信息id查询收费信息
+     */
+    InformationInfo getInformationInfo(Integer feeId);
+
+    /**
+     * 根据处理id查询收费信息
+     */
+    List<InformationInfo> listInformationInfo(Integer relationId);
+
+    /**
+     * 添加收费信息
+     */
+    Integer addInformationInfo(InformationInfo informationInfo);
+
+    /**
+     * 修改收费信息
+     */
+    Integer updateInformationInfo(InformationInfo informationInfo);
+
+    /**
+     * 删除收费信息
+     */
+    Integer delInformationInfo(Integer feeId);
+
 }

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

@@ -1327,4 +1327,65 @@ LEFT JOIN tb_rst_cm_sendback_info csi ON csi.relation_id = cr.relation_id
     DELETE FROM tb_rst_cm_sendback_item WHERE sendback_id = #{sendbackId}
   </delete>
 
+  <!--收费信息sql start -->
+  <select id="getInformationInfo" parameterType="Integer" resultType="InformationInfo">
+    select * from tb_rst_fee_information_info where fee_id = #{feeId};
+  </select>
+  <select id="ListInformationInfo" parameterType="Integer" resultType="InformationInfo">
+    select * from tb_rst_fee_information_info where relation_id = #{relationId};
+  </select>
+  <insert id="addInformationInfo" parameterType="InformationInfo">
+    insert into tb_rst_fee_information_info
+    (
+      relation_id,
+      fee_charges,
+      fee_originally,
+      fee_pay_channel,
+      fee_pay_account,
+      fee_status,
+      fee_desc,
+      fee_create_time
+    )
+    VALUES
+    (
+      #{relationId},
+      #{feeCharges},
+      #{feeOriginally},
+      #{feePayChannel},
+      #{feePayAccount},
+      #{feeStatus},
+      #{feeDesc},
+      NOW()
+    )
+  </insert>
+
+  <update id="updateInformationInfo" parameterType="InformationInfo">
+    UPDATE tb_rst_fee_information_info
+    <set>
+      <if test="feeCharges != null and feeCharges != ''">
+        fee_charges = #{feeCharges},
+      </if>
+      <if test="feeOriginally != null and feeOriginally != ''">
+        fee_originally = #{feeOriginally},
+      </if>
+      <if test="feePayChannel != null and feePayChannel != ''">
+        fee_pay_channel = #{feePayChannel},
+      </if>
+      <if test="feePayAccount != null and feePayAccount != ''">
+        fee_pay_account = #{feePayAccount},
+      </if>
+      <if test="feeStatus != null and feeStatus != ''">
+        fee_status = #{feeStatus},
+      </if>
+      <if test="feeDesc != null and feeDesc != ''">
+        fee_desc = #{feeDesc},
+      </if>
+    </set>
+    WHERE
+      fee_id = #{feeId}
+  </update>
+  <delete id="delInformationInfo" parameterType="Integer">
+    DELETE from tb_rst_fee_information_info where fee_id = #{feeId}
+  </delete>
+  <!--收费信息sql end -->
 </mapper>

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

@@ -480,7 +480,8 @@
             item_create_time,
             pi.product_abbreviation,
             pc.color_abbreviation,
-            pc.color_is_weight
+            pc.color_is_weight,
+            pc.color_is_machine
         FROM
             tb_rst_sales_order_item
       LEFT JOIN tb_rst_product_info pi ON tb_rst_sales_order_item.item_product_id = pi.product_id

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -1456,7 +1456,7 @@ public class AdminSalesOrderController {
         }else if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
             end = (int)useTime+1;
         }
-        if(useTime >= state && useTime < end){
+        if(/*useTime >= state &&*/ useTime < end){
             afterrulesInfo.setIsReturnReason(1);
         }else{
             afterrulesInfo.setIsReturnReason(2);
@@ -1470,7 +1470,7 @@ public class AdminSalesOrderController {
         }else if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
             end = (int)useTime+1;
         }
-        if(useTime >= state && useTime < end){
+        if(/*useTime >= state &&*/ useTime < end){
             afterrulesInfo.setIsQualityPeriod(1);
         }else{
             afterrulesInfo.setIsQualityPeriod(2);
@@ -1484,7 +1484,7 @@ public class AdminSalesOrderController {
         }else if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
             end = (int)useTime+1;
         }
-        if(useTime >= state && useTime < end){
+        if(/*useTime >= state &&*/ useTime < end){
             afterrulesInfo.setIsWarrantyProblem(1);
         }else{
             afterrulesInfo.setIsWarrantyProblem(2);
@@ -1498,7 +1498,7 @@ public class AdminSalesOrderController {
         }else if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
             end = (int)useTime+1;
         }
-        if(useTime >= state && useTime < end){
+        if(/*useTime >= state &&*/ useTime < end){
             afterrulesInfo.setIsGovernancePeriod(1);
         }else{
             afterrulesInfo.setIsGovernancePeriod(2);
@@ -1512,7 +1512,7 @@ public class AdminSalesOrderController {
         }else if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
             end = (int)useTime+1;
         }
-        if(useTime >= state && useTime < end){
+        if(/*useTime >= state &&*/ useTime < end){
             afterrulesInfo.setIsPayRepair(1);
         }else{
             afterrulesInfo.setIsPayRepair(2);

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -192,6 +192,7 @@
 		<typeAlias type="com.iamberry.rst.core.cm.SendbackInfo" alias="SendbackInfo"/>
 		<typeAlias type="com.iamberry.rst.core.cm.SendbackItem" alias="SendbackItem"/>
 		<typeAlias type="com.iamberry.rst.core.order.AfterrulesInfo" alias="AfterrulesInfo"/>
+		<typeAlias type="com.iamberry.rst.core.cm.InformationInfo" alias="InformationInfo"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -252,10 +252,23 @@
                            onclick="acorrect_order(${order.salesId!''});">
                             <i class="Hui-iconfont">&#xe6f7;</i>
                         </a>
-                        <a style="text-decoration:none" href="javascript:;" title="查看售后信息"
-                           onclick="getAfterrulesInfo(${order.salesId!''});">
-                            <i class="Hui-iconfont">&#xe63c;</i>
-                        </a>
+                        <#if order.procTypeId??>
+                            <#if order.procTypeId != '3'>
+                                <#if order.isDevelop == 1>
+                                    <a style="text-decoration:none" href="javascript:;" title="查看售后信息"
+                                       onclick="getAfterrulesInfo(${order.salesId!''});">
+                                        <i class="Hui-iconfont">&#xe63c;</i>
+                                    </a>
+                                </#if>
+                            </#if>
+                        <#else>
+                            <#if order.isDevelop == 1>
+                                <a style="text-decoration:none" href="javascript:;" title="查看售后信息"
+                                   onclick="getAfterrulesInfo(${order.salesId!''});">
+                                    <i class="Hui-iconfont">&#xe63c;</i>
+                                </a>
+                            </#if>
+                        </#if>
                     </td>
                 </tr>
                 </#list>