收款

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -133,7 +133,17 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
 
 
     public List<CmOrderPaymentVoucherVo> findVoucherVoOrderID( Integer shopOrderId){
-        return newOrderDao.findVoucherVoOrderID(shopOrderId);
+        List<CmOrderPaymentVoucherVo> voucherVo = newOrderDao.findVoucherVoOrderID(shopOrderId);
+        if (null != voucherVo &&voucherVo.size() > 0) {
+            for(CmOrderPaymentVoucherVo vou : voucherVo) {
+                if (vou.getRemarks().length() > 100) {
+                    String start = vou.getRemarks().substring(0, 100);
+                    String end = vou.getRemarks().substring(100, vou.getRemarks().length());
+                    vou.setRemarks(start + "<br>" + end);
+                }
+            }
+        }
+        return voucherVo;
     }
 
     @Transactional(readOnly = false)

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -672,7 +672,7 @@ public class ProductService extends CrudService<ProductDao, Product> {
     public List<CmSku> findSkuList(Integer productID) {
         List<CmSku> skus = productDao.findSkuListProduct(productID);
         skus.forEach(s -> {
-            // s.setCostCheckFlag(2);
+            s.setCostCheckFlag(2);
             s.ladderPriceList(productDao.findLadderPriceBySku(s.skuId()));
         });
 

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

@@ -950,7 +950,7 @@
         join cm_discern_receipt cdr on cdr.id = cror.receiptID
         join cm_offline_collection cof on cdr.payType = cof.type
         where cror.delFlag = '0' and cdr.delFlag = '0'
-          <if test="identifying == 1">
+          <if test="identifying == 2">
             <if test="relationType == 1">
                 and cror.orderID in (select shopOrderID from cm_shop_order where orderID = #{orderID}) and cror.relationType
                 = '1'
@@ -959,7 +959,7 @@
                 and cror.orderID = #{orderID} and cror.relationType = '2'
             </if>
           </if>
-          <if test="identifying == 2">
+          <if test="identifying == 1">
               and cror.shopOrderId = #{shopOrderID} and cror.relationType = 2
           </if>
     </select>

src/main/resources/mappings/modules/weisha/CmMallOrganizeMapper.xml

@@ -208,7 +208,7 @@
 	<delete id="updateService">
 		update serviceprovider
 		set openid = NULL,
-		    unionId = NULL
+            unionId = NULL
 		where serviceProviderID = #{serviceProviderId}
 	</delete>
 	<update id="updateClub">

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

@@ -422,6 +422,95 @@
                             <span>子订单收款状态：${fns:getDictLabel(shopOrder.shopReceiptStatus,'receiptStatus' ,'' )}</span>
                         </c:forEach>
                     </div>
+                    <c:if test="${not empty orderInfo.receiptRecordVo}">
+                        <div class="receipt-order-form">
+                            <div class="receipt-order-row4">
+                                <div><h5><label>订单收款记录：</label></h5></div>
+                                <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
+                                    <div class="row4-wrapper">
+                                        <span class="row4-order-no">${index.index + 1}、</span>
+                                        <span class="row4-time">${receiptRecord.receiptTime}</span>
+                                        <c:if test="${receiptRecord.payWay == 1}">
+                                            <%--线上收款--%>
+                                            <span>线上&nbsp;${receiptRecord.bankNameType}</span>
+                                            <span>${receiptRecord.receiptAmount}</span>
+                                            <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
+                                        </c:if>
+                                        <c:if test="${receiptRecord.payWay == 2}">
+                                            <span>线下&nbsp;${receiptRecord.bankNameType}</span>
+                                            <span>${receiptRecord.receiptAmount}</span>
+                                            <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
+                                                <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
+                                            </c:if>
+                                            <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
+                                                    <span>
+                                                        <c:if test="${receiptRecord.receiptStatus eq 4}">
+                                                            ${receiptRecord.reviewUserName}审核不通过(${receiptRecord.reviewDate})
+                                                        </c:if>
+                                                        <c:if test="${receiptRecord.receiptStatus ne 4}">
+                                                            ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})
+                                                        </c:if>
+                                                    </span>
+                                            </c:if>
+                                        </c:if>
+                                        <c:if test="${receiptRecord.payWay == 3}">
+                                            <%--余额抵扣--%>
+                                            <span><a
+                                                    href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
+                                                    style="text-decoration: underline">${fns:getPayTypeStr(receiptRecord.payType)}</a></span>
+                                            <span><a
+                                                    href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
+                                                    style="text-decoration: underline">${receiptRecord.receiptAmount}</a></span>
+                                        </c:if>
+                                        <span>
+                    <%--                        一款多单的时候直接显示再订单上即可，无需收款记录显示--%>
+                                                <c:if test="${!vo.receiptOrderFlag}">
+                                                    <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
+                                                        <label>抹平明细：</label>
+                                                        <c:if test="${order.confirmType eq 1}">
+                                                            <c:if test="${order.receiptOrderFlag}">
+                                                                <font color="red">(一款多单:少收抹平金额未知)</font>
+                                                            </c:if>
+                                                            <c:if test="${!order.receiptOrderFlag}">
+                                                                <font color="red">(少收抹平:
+                                                                    ￥<fmt:formatNumber
+                                                                            value="${order.payableAmount - (empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount)}"
+                                                                            pattern="#0.00"/>)
+                                                                </font>
+                                                            </c:if>
+                                                        </c:if>
+                                                        <c:if test="${order.confirmType eq 2}">
+                                                            <c:if test="${order.receiptOrderFlag}">
+                                                                <font color="red">(一款多单:多收抹平金额未知)</font>
+                                                            </c:if>
+                                                            <c:if test="${!order.receiptOrderFlag}">
+                                                                <font color="red">(多收抹平:
+                                                                    ￥<fmt:formatNumber
+                                                                            value="${(empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount) - order.payableAmount}"
+                                                                            pattern="#0.00"/>)
+                                                                </font>
+                                                            </c:if>
+                                                        </c:if>
+                                                        <c:if test="${order.confirmType eq 3}">
+                                                            <c:if test="${order.receiptOrderFlag}">
+                                                                <font color="red">(一款多单:多收退余额)</font>
+                                                            </c:if>
+                                                            <c:if test="${!order.receiptOrderFlag}">
+                                                                <font color="red">(多收退余额&nbsp;&nbsp;${order.associationType eq 2 ? "(自动)" : ""}:
+                                                                    ￥<fmt:formatNumber
+                                                                            value="${(empty order.returnBalanceAmount ? 0 : order.returnBalanceAmount)}"
+                                                                            pattern="#0.00"/>)
+                                                                </font>
+                                                            </c:if>
+                                                        </c:if>
+                                                    </c:if>
+                                                </c:if>
+                                            </span>
+                                    </div>
+                                </c:forEach>
+                            </div>
+                        </div>
+                    </c:if>
                     <%--<div class="receipt-order-row4">
                         <div><h5><label>订单收款记录：</label></h5></div>
                         <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
@@ -541,98 +630,7 @@
             </div>
         </div>
     </c:if>
-                <c:if test="${not empty orderInfo.receiptRecordVo}">
-                    <div class="receipt-order-form">
-                        <div class="receipt-order-row4">
-                            <div><h5><label>订单收款记录：</label></h5></div>
-                            <c:forEach items="${orderInfo.receiptRecordVo}" var="receiptRecord" varStatus="index">
-                                <div class="row4-wrapper">
-                                    <span class="row4-order-no">${index.index + 1}、</span>
-                                    <span class="row4-time">${receiptRecord.receiptTime}</span>
-                                    <c:if test="${receiptRecord.payWay == 1}">
-                                        <%--线上收款--%>
-                                        <span>线上&nbsp;${receiptRecord.bankNameType}</span>
-                                        <span>${receiptRecord.receiptAmount}</span>
-                                        <span><label>交易号：</label>${receiptRecord.mbOrderId}</span>
-                                    </c:if>
-                                    <c:if test="${receiptRecord.payWay == 2}">
-                                        <span>线下&nbsp;${receiptRecord.bankNameType}</span>
-                                        <span>${receiptRecord.receiptAmount}</span>
-                                        <c:if test="${not empty receiptRecord.confirmUserPermissionID}">
-                                            <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
-                                        </c:if>
-                                        <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
-                                    <span>
-                                        <c:if test="${receiptRecord.receiptStatus eq 4}">
-                                            ${receiptRecord.reviewUserName}审核不通过(${receiptRecord.reviewDate})
-                                        </c:if>
-                                        <c:if test="${receiptRecord.receiptStatus ne 4}">
-                                            ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})
-                                        </c:if>
-                                    </span>
-                                        </c:if>
-                                    </c:if>
-                                    <c:if test="${receiptRecord.payWay == 3}">
-                                        <%--余额抵扣--%>
-                                        <span><a
-                                                href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
-                                                style="text-decoration: underline">${fns:getPayTypeStr(receiptRecord.payType)}</a></span>
-                                        <span><a
-                                                href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${orderInfo.userID}"
-                                                style="text-decoration: underline">${receiptRecord.receiptAmount}</a></span>
-                                    </c:if>
-                                    <span>
-    <%--                        一款多单的时候直接显示再订单上即可，无需收款记录显示--%>
-                                <c:if test="${!vo.receiptOrderFlag}">
-                                    <c:if test="${receiptRecord.confirmType eq 1 || receiptRecord.confirmType eq  2 || receiptRecord.confirmType eq 3}">
-                                        <label>抹平明细：</label>
-                                        <c:if test="${order.confirmType eq 1}">
-                                            <c:if test="${order.receiptOrderFlag}">
-                                                <font color="red">(一款多单:少收抹平金额未知)</font>
-                                            </c:if>
-                                            <c:if test="${!order.receiptOrderFlag}">
-                                                <font color="red">(少收抹平:
-                                                    ￥<fmt:formatNumber
-                                                            value="${order.payableAmount - (empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount)}"
-                                                            pattern="#0.00"/>)
-                                                </font>
-                                            </c:if>
-                                        </c:if>
-                                        <c:if test="${order.confirmType eq 2}">
-                                            <c:if test="${order.receiptOrderFlag}">
-                                                <font color="red">(一款多单:多收抹平金额未知)</font>
-                                            </c:if>
-                                            <c:if test="${!order.receiptOrderFlag}">
-                                                <font color="red">(多收抹平:
-                                                    ￥<fmt:formatNumber
-                                                            value="${(empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount) - order.payableAmount}"
-                                                            pattern="#0.00"/>)
-                                                </font>
-                                            </c:if>
-                                        </c:if>
-                                        <c:if test="${order.confirmType eq 3}">
-                                            <c:if test="${order.receiptOrderFlag}">
-                                                <font color="red">(一款多单:多收退余额)</font>
-                                            </c:if>
-                                            <c:if test="${!order.receiptOrderFlag}">
-                                                <font color="red">(多收退余额&nbsp;&nbsp;${order.associationType eq 2 ? "(自动)" : ""}:
-                                                    ￥<fmt:formatNumber
-                                                            value="${(empty order.returnBalanceAmount ? 0 : order.returnBalanceAmount)}"
-                                                            pattern="#0.00"/>)
-                                                </font>
-                                            </c:if>
-                                        </c:if>
-                                    </c:if>
-                                </c:if>
-                            </span>
-                                    <span>
-                                ${receiptRecord.receiptAmount}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${vo.confirmer} 确认 ${vo.confirmTime}
-                            </span>
-                                </div>
-                            </c:forEach>
-                        </div>
-                    </div>
-                </c:if>
+
     <c:if test="${ voucherVo ne null }">
         <div class="order-rows">
 

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -2187,7 +2187,7 @@
         // if (organize != 0) {
         //     ladderPriceFlag.parent().parent().hide();
         // }
-        // costCheckFlag.parent().parent().hide();
+        costCheckFlag.parent().parent().hide();
 
         ladderPriceBox.find('.ladderPrice').each(function (index, item) {
             var ladderPrice = {}