退款相关页面增加字段

src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -161,6 +161,7 @@ public class CmRefundsProductController extends BaseController {
                 cmReturnedPurchase = cmReturnedPurchaseDao.get(cmReturnedPurchase.getId());//编辑重置数据
             }
             NewOrder newOrder = newOrderService.getNewOrder(cmReturnedPurchase);
+
             //统计订单已支付金额
             Double yizhifu = 0d;
             Double totalDiscount = 0d;

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

@@ -1183,6 +1183,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 }
             }
             List<NewShopOrder> shopOrders = newShopOrderDao.findListByOrderID(cmReturnedPurchase.getOrderID());
+            logger.info("shopOrders》》》》》"+shopOrders.toString());
             if (CollectionUtils.isNotEmpty(shopOrders)) {
                 for (NewShopOrder shopOrder : shopOrders) {
                     //获取退货退款记录

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

@@ -240,9 +240,11 @@
     <select id="findListByOrderID" resultType="newShopOrder">
         SELECT<include refid="shopOrderColumns"/>,
         b.name as shopName,
-        oa.id as orderArchiveId
-        FROM cm_shop_order a left join shop b on a.shopID = b.shopID left join cm_order_archive oa on a.shopOrderID =
-        oa.shopOrderId
+        oa.id as orderArchiveId,
+        co.receiptStatus
+        FROM cm_shop_order a
+        left join shop b on a.shopID = b.shopID
+        left join cm_order_archive oa on a.shopOrderID = oa.shopOrderId
         left join cm_order co on co.orderID = a.orderID
         WHERE a.orderID = #{orderID} ORDER BY a.shopOrderNo DESC
     </select>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -491,6 +491,9 @@
                         <td  style="width: 275px;">
                             子订单金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount}" pattern="0.00" maxFractionDigits="2" />
                         </td>
+                        <td>
+                            收款状态：${fns:getDictLabel(shopOrder.receiptStatus,'receiptStatus' ,'' )}
+                        </td>
                         <td>
                             发货状态：${fns:getDictLabel(shopOrder.sendOutStatus,'sendOutStatus' ,'' )}
                         </td>
@@ -503,6 +506,40 @@
                                 <font color="red" class="businessNumber">(商户号:&nbsp;&nbsp;${shopOrder.commercialCode})</font>
                             </c:if>
                         </td>
+                    </tr>
+                    <tr>
+                        <td style="width: 300px;">
+                           商品总额：${shopOrder.totalAmount}
+                        </td>
+                        <td  style="width: 275px;">
+                            优惠：￥<fmt:formatNumber type="number" value="${shopOrder.preferential}" pattern="0.00" maxFractionDigits="2" />
+                        </td>
+                        <td>
+                           余额抵扣：￥<fmt:formatNumber type="number" value="${shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                        </td>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount <= 0}">
+                            <td>
+                                应付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount >= 0}">
+                            <td>
+                                应付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
+                        <td>
+                            已付金额：￥<fmt:formatNumber type="number" value="${shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                        </td>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount <= 0}">
+                            <td>
+                                待付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount >= 0}">
+                            <td>
+                                待付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
                     </tr>
                         <c:forEach items="${shopOrder.newOrderProducts}" var="newOrderProduct" varStatus="productStatus">
                     <tr>
@@ -641,74 +678,6 @@
                 </table>
             </c:if>
         </c:forEach>
-    <table id="orderTable" class="table table-striped table-bordered table-condensed">
-        <tr>
-            <td>
-                <div class="order-rows">
-                    <label>发票信息：</label>
-                    <input id="invoice1" class="invoice1" name="invoice" type="radio" ${order.orderInvoice.type == 0 ? 'checked="checked"':''} disabled="disabled">
-                    <label for="invoice1">不需要发票</label>
-                    <input id="invoice2" name="invoice" type="radio" ${order.orderInvoice.type == 1 ? 'checked="checked"':''} disabled="disabled">
-                    <label for="invoice2">普通发票</label>
-                    <input id="invoice3" name="invoice" type="radio" ${order.orderInvoice.type == 2 ? 'checked="checked"':''} disabled="disabled">
-                    <label for="invoice3">增值税发票</label>
-                    <c:if test="${order.orderInvoice.type == 1}">
-                        <br>
-                        <div>
-                            <span>
-                    <c:if test="${order.orderInvoice.invoiceTitleType eq 0}">
-                        发票抬头：
-                        <span>${order.orderInvoice.invoiceTitle}</span>
-                    </c:if>
-                    <c:if test="${order.orderInvoice.invoiceTitleType eq 1}">
-                        发票抬头：
-                        <span>${order.orderInvoice.invoiceTitle}</span>
-                        &nbsp;&nbsp;&nbsp;&nbsp;
-                        纳税人识别号：
-                        <span>${order.orderInvoice.corporationTaxNum}</span>
-                    </c:if>
-                </span>
-                        </div>
-                    </c:if>
-                    <c:if test="${order.orderInvoice.type == 2}">
-                        <table>
-                            <tr>
-                                <td><span>单位名称：${order.orderInvoice.invoiceTitle}</span></td>
-                                <td><span>纳税人识别号：${order.orderInvoice.corporationTaxNum}</span></td>
-                                <td><span>注册地址：${order.orderInvoice.registeredAddress}</span></td>
-                            </tr>
-                            <tr>
-                                <td><span>注册电话：${order.orderInvoice.registeredPhone}</span></td>
-                                <td><span>开户银行：${order.orderInvoice.openBank}</span></td>
-                                <td><span>银行账号：${order.orderInvoice.bankAccountNo}</span></td>
-                            </tr>
-                        </table>
-                    </c:if>
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <div class="order-rows">
-                    <label>售后条款：</label>
-                    <c:forEach items="${bpClauses}" var="items" varStatus="index">
-                        <c:if test="${items.clauseType ne 0  }">
-                <span>
-                    <input id="clauseId${index.index+1}" class="clauseId" name="clauseID" type="radio"
-                           value="${items.id}"${(order.clauseID)==(items.id)?'checked="checked"':''}
-                           class="required" class="clauseId" disabled="disabled">
-                    <input type="hidden" class="clauseContent" id="clauseContent${index.index+1}"
-                           value="${fns:escapeHtml(order.clauseContent)}">
-                    <input type="hidden" class="clauseName" id="clauseName${index.index+1}" value="${order.clauseName}">
-                    <a href="javascript:void(0);"
-                       onclick="openClauseInfo(${index.index+1});"><label>${order.clauseName}</label></a>
-                </span>
-                        </c:if>
-                    </c:forEach>
-                </div>
-            </td>
-        </tr>
-    </table>
     <div class="form-actions">
                 <input id="btnSubmit" class="btn btn-primary" type="submit" value="申 请"/>&nbsp;
 

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderConfirmReturnRecord.jsp

@@ -362,6 +362,7 @@
     <input type="hidden" id="shopOrderSize" value='${fns:listToJson(cmReturnedPurchase.shopOrderReturnedList)}'>
     <c:forEach items="${cmReturnedPurchase.shopOrderReturnedList}" var="shopOrderReturned"
                varStatus="shopOrderReturnedStatus">
+        <c:forEach items="${order.newShopOrders}" var="shopOrder" varStatus="status">
         <tr>
             <td colspan="7">
                 <table id="shopOrderReturnedTable${shopOrderReturnedStatus.index}"
@@ -371,6 +372,9 @@
                             子订单编号(ID)：${shopOrderReturned.shopOrderNo}(${shopOrderReturned.shopOrderID})
                         </td>
                         <td style="width: 250px;">子订单金额：${shopOrderReturned.productAmount}</td>
+                        <td>
+                            收款状态：${fns:getDictLabel(shopOrder.receiptStatus,'receiptStatus' ,'' )}
+                        </td>
                         <td>发货状态：
                                 ${fns:getDictLabel(shopOrderReturned.sendOutStatus,'sendOutStatus' ,'' )}
                         </td>
@@ -384,6 +388,41 @@
                             </c:if>
                         </td>
                     </tr>
+            <tr>
+                <td style="width: 300px;">
+                    商品总额：${shopOrder.totalAmount}
+                </td>
+                <td  style="width: 275px;">
+                    优惠：￥<fmt:formatNumber type="number" value="${shopOrder.preferential}" pattern="0.00" maxFractionDigits="2" />
+                </td>
+                <td>
+                    余额抵扣：￥<fmt:formatNumber type="number" value="${shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                </td>
+                <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount <= 0}">
+                    <td>
+                        应付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                    </td>
+                </c:if>
+                <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount >= 0}">
+                    <td>
+                        应付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                    </td>
+                </c:if>
+                <td>
+                    已付金额：￥<fmt:formatNumber type="number" value="${shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                </td>
+                <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount <= 0}">
+                    <td>
+                        待付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                    </td>
+                </c:if>
+                <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount >= 0}">
+                    <td>
+                        待付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                    </td>
+                </c:if>
+            </tr>
+                    </c:forEach>
                     <c:forEach items="${shopOrderReturned.cmReturnedPurchaseProductList}"
                                var="cmReturnedPurchaseProduct" varStatus="cmReturnedPurchaseProductStatus">
                         <tr>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp

@@ -504,12 +504,17 @@
 
         <table id="cmReturnedPurchaseTable" class="table table-striped table-bordered table-condensed">
                 <c:forEach items="${cmReturnedPurchase.shopOrderReturnedList}" var="shopOrderReturned" varStatus="shopOrderReturnedStatus">
+                    <c:forEach items="${order.newShopOrders}" var="shopOrder" varStatus="status" begin="1" end="18">
+
                     <tr>
                         <td colspan="7">
                             <table id="shopOrderReturnedTable${shopOrderReturnedStatus.index}" class="table table-striped table-bordered table-condensed">
                                 <tr>
                                     <td style="width: 300px;">子订单编号(ID)：${shopOrderReturned.shopOrderNo}(${shopOrderReturned.shopOrderID})</td>
                                     <td  style="width: 250px;">子订单金额：${shopOrderReturned.productAmount}</td>
+                                    <td>
+                                        收款状态：${fns:getDictLabel(shopOrder.receiptStatus,'receiptStatus' ,'' )}
+                                    </td>
                                     <td>发货状态：
                                             ${fns:getDictLabel(shopOrderReturned.sendOutStatus,'sendOutStatus' ,'' )}
                                     </td>
@@ -518,6 +523,41 @@
                                     </td>
                                     <td>供应商：${shopOrderReturned.shopName}</td>
                                 </tr>
+                                <tr>
+                                    <td style="width: 300px;">
+                                        商品总额：${shopOrder.totalAmount}
+                                    </td>
+                                    <td  style="width: 275px;">
+                                        优惠：￥<fmt:formatNumber type="number" value="${shopOrder.preferential}" pattern="0.00" maxFractionDigits="2" />
+                                    </td>
+                                    <td>
+                                        余额抵扣：￥<fmt:formatNumber type="number" value="${shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                                    </td>
+                                    <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount <= 0}">
+                                        <td>
+                                            应付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                                        </td>
+                                    </c:if>
+                                    <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount >= 0}">
+                                        <td>
+                                            应付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                                        </td>
+                                    </c:if>
+                                    <td>
+                                        已付金额：￥<fmt:formatNumber type="number" value="${shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                                    </td>
+                                    <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount <= 0}">
+                                    <td>
+                                        待付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                                    </td>
+                                    </c:if>
+                                    <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount >= 0}">
+                                        <td>
+                                            待付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                                        </td>
+                                    </c:if>
+                                </tr>
+                    </c:forEach>
                                 <c:forEach items="${shopOrderReturned.cmReturnedPurchaseProductList}" var="cmReturnedPurchaseProduct" varStatus="cmReturnedPurchaseProductStatus">
                                     <tr>
                                         <td  rowspan="4" style="width: 295px;height: 125px">
@@ -556,6 +596,7 @@
                         </td>
                     </tr>
                 </c:forEach>
+
         </table>
     </form:form>
 </c:forEach>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp

@@ -441,12 +441,16 @@
 <c:forEach items="${cmReturnedPurchaseList}" var="cmReturnedPurchase" varStatus="cmReturnedPurchaseStatus">
             <input type="hidden" id="shopOrderSize" value='${fns:listToJson(cmReturnedPurchase.shopOrderReturnedList)}'>
             <c:forEach items="${cmReturnedPurchase.shopOrderReturnedList}" var="shopOrderReturned" varStatus="shopOrderReturnedStatus">
+                <c:forEach items="${order.newShopOrders}" var="shopOrder" varStatus="status">
                 <tr>
                     <td colspan="7">
                     <table id="shopOrderReturnedTable${shopOrderReturnedStatus.index}" class="table table-striped table-bordered table-condensed">
                         <tr>
                             <td style="width: 300px;">子订单编号(ID)：${shopOrderReturned.shopOrderNo}(${shopOrderReturned.shopOrderID})</td>
                             <td  style="width: 250px;">子订单金额：${shopOrderReturned.productAmount}</td>
+                            <td>
+                                收款状态：${fns:getDictLabel(shopOrder.receiptStatus,'receiptStatus' ,'' )}
+                            </td>
                             <td>发货状态：
                                     ${fns:getDictLabel(shopOrderReturned.sendOutStatus,'sendOutStatus' ,'' )}
                             </td>
@@ -460,6 +464,41 @@
                                 </c:if>
                             </td>
                         </tr>
+                    <tr>
+                        <td style="width: 300px;">
+                            商品总额：${shopOrder.totalAmount}
+                        </td>
+                        <td  style="width: 275px;">
+                            优惠：￥<fmt:formatNumber type="number" value="${shopOrder.preferential}" pattern="0.00" maxFractionDigits="2" />
+                        </td>
+                        <td>
+                            余额抵扣：￥<fmt:formatNumber type="number" value="${shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                        </td>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount <= 0}">
+                            <td>
+                                应付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount >= 0}">
+                            <td>
+                                应付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
+                        <td>
+                            已付金额：￥<fmt:formatNumber type="number" value="${shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                        </td>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount <= 0}">
+                            <td>
+                                待付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount >= 0}">
+                            <td>
+                                待付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
+                    </tr>
+                </c:forEach>
                         <c:forEach items="${shopOrderReturned.cmReturnedPurchaseProductList}" var="cmReturnedPurchaseProduct" varStatus="cmReturnedPurchaseProductStatus">
                             <tr>
                                 <td  rowspan="4" style="width: 295px;height: 125px">

src/main/webapp/WEB-INF/views/modules/bulkpurchase/organizeOrderReturnRecord.jsp

@@ -577,6 +577,7 @@
             </tr>
                 </c:forEach>--%>
                 <c:forEach items="${cmReturnedPurchase.shopOrderReturnedList}" var="shopOrderReturned" varStatus="shopOrderReturnedStatus">
+                <c:forEach items="${order.newShopOrders}" var="shopOrder" varStatus="status">
                     <tr>
                         <td colspan="7">
                             <table id="shopOrderReturnedTable${shopOrderReturnedStatus.index}" class="table table-striped table-bordered table-condensed">
@@ -591,6 +592,41 @@
                                     </td>
                                     <td>供应商：${shopOrderReturned.shopName}</td>
                                 </tr>
+                    <tr>
+                        <td style="width: 300px;">
+                            商品总额：${shopOrder.totalAmount}
+                        </td>
+                        <td  style="width: 275px;">
+                            优惠：￥<fmt:formatNumber type="number" value="${shopOrder.preferential}" pattern="0.00" maxFractionDigits="2" />
+                        </td>
+                        <td>
+                            余额抵扣：￥<fmt:formatNumber type="number" value="${shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                        </td>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount <= 0}">
+                            <td>
+                                应付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount >= 0}">
+                            <td>
+                                应付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
+                        <td>
+                            已付金额：￥<fmt:formatNumber type="number" value="${shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                        </td>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount <= 0}">
+                            <td>
+                                待付金额：￥<fmt:formatNumber type="number" value="0.00" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
+                        <c:if test="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount >= 0}">
+                            <td>
+                                待付金额：￥<fmt:formatNumber type="number" value="${shopOrder.totalAmount-shopOrder.preferential-shopOrder.discountAmount-shopOrder.payedShopAmount}" pattern="0.00" maxFractionDigits="2" />
+                            </td>
+                        </c:if>
+                    </tr>
+                           </c:forEach>
                                 <c:forEach items="${shopOrderReturned.cmReturnedPurchaseProductList}" var="cmReturnedPurchaseProduct" varStatus="cmReturnedPurchaseProductStatus">
                                     <tr>
                                         <td  rowspan="4" style="width: 295px;height: 125px">
@@ -831,4 +867,4 @@
 
 </script>
 </body>
-</html>
+</html>

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

@@ -116,7 +116,7 @@
 								${cs}<br/>
 							</c:forEach>
 						</td>
-						<td>${s.income}</td>
+						<td>${s.income-s.discountTotalFee-s.couponAmount}</td>
 						<td>
 							<label class="clubFreight"  style="display: none">
 								<c:choose>
@@ -207,7 +207,7 @@
 						<td>${s.shopOrderNo}(${s.shopOrderID})</td>
 						<td colspan="3">${s.shopName}</td>
 						<td colspan="3" class="payCm-t">子订单佣金</td>
-						<td colspan="3" class="product-fee">${s.shopProductAmount}</td>
+						<td colspan="3" class="product-fee">${s.shopProductAmount-s.discountTotalFee-s.couponAmount}</td>
 
 						<td class="taxes">
 							<fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/>