bugfix

src/main/resources/mappings/modules/product/CmPromotionMapper.xml

@@ -165,7 +165,7 @@
     </select>
 
     <select id="findAllProduct" resultType="com.caimei.modules.product.entity.Product">
-        SELECT
+        SELECT distinct
         p.productId as productID,
         p.mainImage as mainImage,
         p.name as name,

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

@@ -46,10 +46,21 @@
         .check-btn-wrapper input:last-child {
             margin-left: 10px;
         }
+
         .select-ele input-medium:hover .options {
             display: block;
         }
-        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
+
+        .weishaIcon {
+            background: darkorange;
+            color: white;
+            margin: 0 0px;
+            padding: 0 3px;
+            font-style: normal;
+            font-size: 12px;
+            display: inline-block;
+            border-radius: 2px
+        }
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -60,12 +71,12 @@
                 $(".secondType").hide();
             }
         });
-            $("#receipt").hover(function(){
-                console.log(1);
-                $("#mark-info").show();
-            },function(){
-                $("#mark-info").hide();
-            })
+        $("#receipt").hover(function () {
+            console.log(1);
+            $("#mark-info").show();
+        }, function () {
+            $("#mark-info").hide();
+        })
 
         function page(n, s) {
             $("#pageNo").val(n);
@@ -90,9 +101,9 @@
         }
 
 
-        function changeReceiptType(){
+        function changeReceiptType() {
             var receiptType = $("#receiptType").val();
-            var newReceiptType=$("#newReceiptType");
+            var newReceiptType = $("#newReceiptType");
             if (receiptType == 2) {
                 $(".secondType").show();
             } else {
@@ -117,7 +128,8 @@
             <label>收款ID：</label>
             <form:input path="id" htmlEscape="false" maxlength="20" class="input-medium" onchange="onlynum(this)"/>
             <label>子订单ID：</label>
-            <form:input path="shopOrderId" htmlEscape="false" maxlength="20" class="input-medium" onchange="onlynum(this)"/>
+            <form:input path="shopOrderId" htmlEscape="false" maxlength="20" class="input-medium"
+                        onchange="onlynum(this)"/>
             <label>子订单编号：</label>
             <form:input path="shopOrderNo" htmlEscape="false" maxlength="50" class="input-medium"/>
             <label>机构名称：</label>
@@ -157,19 +169,19 @@
             <label>收款账号：</label>
             <form:select path="payType" class="select-ele input-medium">
                 <form:option value="" label="全部"/>
-<%--                <c:forEach items="${offlineCollections}" var="offlineCollections" varStatus="index">--%>
-                    <form:options items="${cmReceiTypes}" itemLabel="type" itemValue="id"
-                                  htmlEscape="false"/>
-<%--                </c:forEach>--%>
+                <%--                <c:forEach items="${offlineCollections}" var="offlineCollections" varStatus="index">--%>
+                <form:options items="${cmReceiTypes}" itemLabel="type" itemValue="id"
+                              htmlEscape="false"/>
+                <%--                </c:forEach>--%>
             </form:select>
         </div>
         <div>
-<%--            <label>收款进度：</label>--%>
-<%--            <form:select path="receiptProgress" class="select-ele input-medium">--%>
-<%--                <form:option value="" label="全部"/>--%>
-<%--                <form:options items="${fns:getDictList('receiptProgress')}" itemLabel="label" itemValue="value"--%>
-<%--                              htmlEscape="false"/>--%>
-<%--            </form:select>--%>
+                <%--            <label>收款进度：</label>--%>
+                <%--            <form:select path="receiptProgress" class="select-ele input-medium">--%>
+                <%--                <form:option value="" label="全部"/>--%>
+                <%--                <form:options items="${fns:getDictList('receiptProgress')}" itemLabel="label" itemValue="value"--%>
+                <%--                              htmlEscape="false"/>--%>
+                <%--            </form:select>--%>
             <label>订单类型：</label>
             <form:select path="receiptOrderType" class="select-ele input-medium">
                 <form:option value="" label="全部"/>
@@ -233,20 +245,20 @@
             <td><fmt:formatNumber type="number" pattern="#,##0.00"
                                   value="${cmDiscernReceipt.receiptAmount}"/></td>
             <c:if test="${cmDiscernReceipt.receiptType != 2}">
-            <td>
-                <c:if test="${cmDiscernReceipt.payWay == '1'}">
-                    线上
-                </c:if>
-                <c:if test="${cmDiscernReceipt.payWay == '2'}">
-                    线下
-                </c:if>
-                <c:if test="${cmDiscernReceipt.payWay == '3'}">
-                    余额抵扣
-                </c:if>
-                <c:if test="${cmDiscernReceipt.payWay != '1' && cmDiscernReceipt.payWay != '2'&& cmDiscernReceipt.payWay != '3'}">
-                    ---
-                </c:if>
-            </td>
+                <td>
+                    <c:if test="${cmDiscernReceipt.payWay == '1'}">
+                        线上
+                    </c:if>
+                    <c:if test="${cmDiscernReceipt.payWay == '2'}">
+                        线下
+                    </c:if>
+                    <c:if test="${cmDiscernReceipt.payWay == '3'}">
+                        余额抵扣
+                    </c:if>
+                    <c:if test="${cmDiscernReceipt.payWay != '1' && cmDiscernReceipt.payWay != '2'&& cmDiscernReceipt.payWay != '3'}">
+                        ---
+                    </c:if>
+                </td>
             </c:if>
             <c:if test="${cmDiscernReceipt.receiptType == 2}">
                 <td>
@@ -263,21 +275,21 @@
             </c:if>
             <td>
                     ${fns:getDictLabel(cmDiscernReceipt.receiptType, 'receiptType', null)}
-                        <c:if test="${cmDiscernReceipt.receiptType eq 2 or cmDiscernReceipt.receiptType eq 9}">
-                <c:if test="${cmDiscernReceipt.newReceiptType eq 1}">-上架费</c:if>
-                        <c:if test="${cmDiscernReceipt.newReceiptType eq 2}">-服务返佣</c:if>
-                        <c:if test="${cmDiscernReceipt.newReceiptType eq 3}">-认证通会员</c:if>
-                        <c:if test="${cmDiscernReceipt.receiptType eq 9}">认证通会员</c:if>
-                        <c:if test="${cmDiscernReceipt.newReceiptType eq 4}">-认证通企划</c:if>
-                        <c:if test="${cmDiscernReceipt.newReceiptType eq 5}">-其他</c:if>
-                        </c:if>
+                <c:if test="${cmDiscernReceipt.receiptType eq 2 or cmDiscernReceipt.receiptType eq 9}">
+                    <c:if test="${cmDiscernReceipt.newReceiptType eq 1}">-上架费</c:if>
+                    <c:if test="${cmDiscernReceipt.newReceiptType eq 2}">-服务返佣</c:if>
+                    <c:if test="${cmDiscernReceipt.newReceiptType eq 3}">-认证通会员</c:if>
+                    <c:if test="${cmDiscernReceipt.receiptType eq 9}">认证通会员</c:if>
+                    <c:if test="${cmDiscernReceipt.newReceiptType eq 4}">-认证通企划</c:if>
+                    <c:if test="${cmDiscernReceipt.newReceiptType eq 5}">-其他</c:if>
+                </c:if>
             </td>
             <td>
                 <c:if test="${cmDiscernReceipt.organizeID == 1||cmDiscernReceipt.organizeID == 4}">
-               线下凭证
+                    线下凭证
                 </c:if>
                 <c:if test="${!(cmDiscernReceipt.organizeID == 1||cmDiscernReceipt.organizeID == 4)}">
-              ${cmDiscernReceipt.bankNameType}
+                    ${cmDiscernReceipt.bankNameType}
                 </c:if>
             </td>
             <td>
@@ -308,6 +320,9 @@
                 <c:if test="${cmDiscernReceipt.payWay == '1' && empty cmDiscernReceipt.shopName}">
                     采美
                 </c:if>
+                <c:if test="${cmDiscernReceipt.payWay == '2' && (cmDiscernReceipt.receiptType== 10 || cmDiscernReceipt.receiptType== 11)}">
+                    采美
+                </c:if>
             </td>
             <td>
                 <c:if test="${cmDiscernReceipt.organizeID == 1}">
@@ -329,21 +344,21 @@
             </td>
             <td>
                     ${cmDiscernReceipt.orderType}
-<%--                <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orderType}</c:if>--%>
-<%--                <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>--%>
-<%--                <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>--%>
-<%--                <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>--%>
+                    <%--                <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orderType}</c:if>--%>
+                    <%--                <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>--%>
+                    <%--                <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>--%>
+                    <%--                <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>--%>
             </td>
-           <td>   <%--  <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.orderID}）</a>--%>
-<%--                <c:if test="${cmDiscernReceipt.newReceiptType eq 2 && not empty cmDiscernReceipt.shopOrderNo}"><a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.shopOrderId}）</a></c:if>--%>
-<%--                <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orders}</c:if>--%>
-<%--                <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>--%>
-<%--                <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>--%>
+            <td>   <%--  <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.orderID}）</a>--%>
+                    <%--                <c:if test="${cmDiscernReceipt.newReceiptType eq 2 && not empty cmDiscernReceipt.shopOrderNo}"><a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.shopOrderId}）</a></c:if>--%>
+                    <%--                <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orders}</c:if>--%>
+                    <%--                <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>--%>
+                    <%--                <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>--%>
                     ${cmDiscernReceipt.orders}
-                <%--<c:if test="${cmDiscernReceipt.shopOrderId == null}">-----</c:if>
-                <c:if test="${cmDiscernReceipt.shopOrderId != null}">
-                    <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}&shopOrderID=${cmDiscernReceipt.shopOrderId}">子订单${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.shopOrderId}）</a>
-                </c:if>--%>
+                    <%--<c:if test="${cmDiscernReceipt.shopOrderId == null}">-----</c:if>
+                    <c:if test="${cmDiscernReceipt.shopOrderId != null}">
+                        <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}&shopOrderID=${cmDiscernReceipt.shopOrderId}">子订单${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.shopOrderId}）</a>
+                    </c:if>--%>
             </td>
             <shiro:hasPermission name="order:cmDiscernReceipt:edit">
                 <td>

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

@@ -44,7 +44,7 @@
 				<tr>
 					<td>${record.operatTime}</td>
 					<td>
-						<c:if test="${record.type == '1' || record.type == '3'}">
+						<c:if test="${record.type == '1' || record.type == '3' || record.type == '4'}">
 							收入
 						</c:if>
 						<c:if test="${record.type == '2'}">
@@ -62,6 +62,9 @@
 						<c:if test="${record.type == '3'}">
 							<a href="${ctx}/order/cmRefundShop/toRefund?id=${record.refundShopID}">供应商退款</a>
 						</c:if>
+						<c:if test="${record.type == '4'}">
+							<a href="${ctx}/order/cmDiscernReceipt/detail?id=${record.receiptID}&shopOrderId=${record.shopOrderId}">平台服务费欠款转移</a>
+						</c:if>
 					</td>
 				</tr>
 			</c:forEach>