bug fixes

src/main/java/com/caimei/modules/order/web/CmShopOrderController.java

@@ -166,10 +166,12 @@ public class CmShopOrderController extends BaseController {
     public String payedAndRefundRecordList(String shopOrderID, HttpServletRequest request, HttpServletResponse response, Model model, Integer operatingMode) {
         List<CmPayShopRecord> pr = newShopOrderService.getPayedRecords(shopOrderID);
         List<CmRefundShopRecord> rr = newShopOrderService.getRefundedRecords(shopOrderID);
+        List<CmDiscernReceipt> receipt = newShopOrderService.getDiscernReceipts(Integer.valueOf(shopOrderID));
         NewShopOrder shopOrder = newShopOrderService.getShopOrderInfo(shopOrderID);
         model.addAttribute("pr", pr);
         model.addAttribute("rr", rr);
         model.addAttribute("s", shopOrder);
+        model.addAttribute("receipt", receipt);
         model.addAttribute("operatingMode", operatingMode);
         return "modules/order/payedAndRefundRecordList";
     }

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

@@ -201,7 +201,7 @@
                             console.log('===', inputTotalAmount);
                         });
                         if (Number(differencePrice - inputTotalAmount - waitPayShop) > 0.1) {
-                            alertx("退款金额应等于差价与代付金额的差值");
+                            alertx("退款金额应等于差价与待付金额的差值");
                             return false;
                         }
                     }

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

@@ -269,6 +269,36 @@
         </tr>
         </thead>
         <tbody>
+        <c:forEach items="${receipts}" var="r">
+            <tr>
+                <td>${r.id}</td>
+                <td><a href="${ctx}/order/cmDiscernReceipt/detail?id=${r.id}">${r.id}</a></td>
+                <td>${r.receiptDate}</td>
+                <td>
+                    <div class="text-left">
+                        线下转账:
+                        <c:if test="${r.payType == '1'}">
+                            建设银行7297
+                        </c:if>
+                        <c:if test="${r.payType == '2'}">
+                            中信银行0897
+                        </c:if>
+                        <c:if test="${r.payType == '3'}">
+                            中信银行7172
+                        </c:if>
+                        <c:if test="${r.payType == '4'}">
+                            广发银行0115
+                        </c:if>
+                        <c:if test="${r.payType == '5'}">
+                            广发银行5461
+                        </c:if>
+                        &nbsp&nbsp
+                        ¥${r.receiptAmount}<br>
+                    </div>
+                </td>
+                <td>${r.receiptAmount}</td>
+            </tr>
+        </c:forEach>
         <c:forEach items="${rr}" var="r">
             <tr>
                 <td>${r.id}</td>

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

@@ -382,7 +382,7 @@
                         ¥${r.receiptAmount}<br>
                     </div>
                 </td>
-                <td>${r.refundAmount}</td>
+                <td>${r.receiptAmount}</td>
             </tr>
         </c:forEach>
         <c:forEach items="${rr}" var="r">

src/main/webapp/WEB-INF/views/modules/user/userBalanceWithdrawalsReview.jsp

@@ -214,14 +214,18 @@
                     showTips('信息提示','审核原因不能为空');
                     return false;
                 }
-                if(unaccessFlag) {
+                if (unaccessFlag) {
                     window.location.href = '${ctx}/user/cmUserBalanceWithdrawals/withdrawalReviewData?id=' + id + '&reason=' + textareaVal;
                     unaccessFlag = false;
                 }
             } else {
-                if(accessFlag) {
-                    window.location.href = '${ctx}/user/cmUserBalanceWithdrawals/withdrawalReviewData?payType=' + payType + '&id=' + id;
-                    accessFlag = false;
+                if (accessFlag) {
+                    top.$.jBox.confirm("确定审核通过该提现单吗？", '系统提示', function (v, h, f) {
+                        if (v == 'ok') {
+                            window.location.href = '${ctx}/user/cmUserBalanceWithdrawals/withdrawalReviewData?payType=' + payType + '&id=' + id;
+                            accessFlag = false;
+                        }
+                    }, {buttonsFocus: 1, persistent: true});
                 }
             }
         })