添加收款方

src/main/java/com/caimei/modules/order/entity/CmDiscernReceipt.java

@@ -77,8 +77,15 @@ public class CmDiscernReceipt extends DataEntity<CmDiscernReceipt> {
     private String checkMan;
     private String  shopOrderNos;
     private String jgName;//机构名称
+    private String paYee;//收款方(虚拟字段)
 
+    public String getPaYee() {
+        return paYee;
+    }
 
+    public void setPaYee(String paYee) {
+        this.paYee = paYee;
+    }
 
     public String getJgName() {
         return jgName;

src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

@@ -198,6 +198,17 @@
                     and (select count(1) from cm_receipt_order_relation where receiptID = a.id and delFlag = '0')
                     <![CDATA[ > ]]> 1
                 </if>
+            </if>
+            <if test="paYee !=null and paYee != ''">
+                <if test="paYee == '采美'">
+                   and a.payWay = 3
+                    OR a.payWay = 2
+                    AND a.newReceiptType != 3 AND a.payWay =2
+                </if>
+            <if test="payWay==1">
+               and s.name=#{paYee}
+            </if>
+
             </if>
             and a.delFlag = '0' group by a.id
         </where>

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptForm.jsp

@@ -191,13 +191,17 @@
                         </c:if>
 					</span>
             <span><label>收款类型：</label>${fns:getPayTypeStr(vo.payType)}</span>
-            <span><label>收款方：</label> <c:if
-                    test="${(vo.payWay == '3' || vo.payWay == '2') && (vo.receiptType==1 || vo.receiptType==2 || vo.receiptType==3 || vo.receiptType==4) || cmDiscernReceipt.newReceiptType == 3 && vo.payWay ==2}">
+            <span><label>收款方：</label>
+                <c:if test="${(cmDiscernReceipt.payWay == '3' || cmDiscernReceipt.payWay == '2') && (cmDiscernReceipt.receiptType==1 || cmDiscernReceipt.receiptType==2 || cmDiscernReceipt.receiptType==3 || cmDiscernReceipt.receiptType==4) || cmDiscernReceipt.newReceiptType == 3 && cmDiscernReceipt.payWay ==2}">
                 采美
             </c:if>
-                <c:if test="${vo.payWay == '1' && (vo.receiptType==6 || vo.receiptType==7 || vo.receiptType==8)|| cmDiscernReceipt.newReceiptType == 3 && vo.payWay =='1'}">
-                    ${vo.shopName}
-                </c:if></span>
+                <c:if test="${cmDiscernReceipt.payWay == '1'}">
+                    ${cmDiscernReceipt.shopName}
+                </c:if>
+                <c:if test="${cmDiscernReceipt.payWay == '1' && empty cmDiscernReceipt.shopName}">
+                    采美
+                </c:if>
+            </span>
             <span><label>收款金额：</label>${vo.receiptAmount}</span>
             <span><label>收款时间：</label>${vo.receiptDate}</span>
             <span><label>收款状态：</label>

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptList.jsp

@@ -91,11 +91,13 @@
 
 
         function changeReceiptType(){
-            debugger
             var receiptType = $("#receiptType").val();
+            var newReceiptType=$("#newReceiptType");
             if (receiptType == 2) {
                 $(".secondType").show();
             } else {
+                newReceiptType.val("");
+                console.log(newReceiptType.val())
                 $(".secondType").hide();
             }
         }
@@ -120,7 +122,7 @@
             <label>机构名称：</label>
             <form:input path="userName" htmlEscape="false" maxlength="25" class="input-medium"/>
             <label>收款方：</label>
-            <form:input path="Payee" htmlEscape="false" maxlength="20" class="input-medium"/>
+            <form:input path="paYee" htmlEscape="false" maxlength="20" class="input-medium"/>
         </div>
         <div>
             <label>收款方式：</label>
@@ -285,9 +287,12 @@
                 <c:if test="${(cmDiscernReceipt.payWay == '3' || cmDiscernReceipt.payWay == '2') && (cmDiscernReceipt.receiptType==1 || cmDiscernReceipt.receiptType==2 || cmDiscernReceipt.receiptType==3 || cmDiscernReceipt.receiptType==4) || cmDiscernReceipt.newReceiptType == 3 && cmDiscernReceipt.payWay ==2}">
                     采美
                 </c:if>
-                <c:if test="${cmDiscernReceipt.payWay == '1' && (cmDiscernReceipt.receiptType==6 || cmDiscernReceipt.receiptType==7 || cmDiscernReceipt.receiptType==8)||cmDiscernReceipt.newReceiptType == 3 && cmDiscernReceipt.payWay ==1}">
+                <c:if test="${cmDiscernReceipt.payWay == '1'}">
                     ${cmDiscernReceipt.shopName}
                 </c:if>
+                <c:if test="${cmDiscernReceipt.payWay == '1' && empty cmDiscernReceipt.shopName}">
+                    采美
+                </c:if>
             </td>
             <td>
                 <c:if test="${cmDiscernReceipt.organizeID == 1}">

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -669,7 +669,7 @@
                         <a href="javascript:void(0);"
                            onclick="modelShow('${order.orderID}')">编辑经理折扣</a>
                     </c:if>
-                    <c:if test="${order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag ne 1 && order.rechargeGoods ne 1 && order.rechargeGoods ne 3}">
+                    <c:if test="${order.orderType != 1 && order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag ne 1 && order.rechargeGoods ne 1 && order.rechargeGoods ne 3}">
                         <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"
                            onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>
                     </c:if>