bug fixes

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

@@ -949,13 +949,14 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
             if (refundWay.equals("1")) {
                 //线下退
                 refundBalanceAmount = BigDecimal.ZERO;
-            } else if (refundWay.contains("2")) {
+            } else if (refundWay.equals("2")) {
                 //欠款账簿
                 refundAmount = BigDecimal.ZERO;
             } else {
                 //两种方式都有
                 refundWay = "3";
             }
+            logger.info("待付waitRefund>>>" + waitRefund + ">>>refundAmount金额>>>" + refundAmount + ">>>refundBalanceAmount金额>>>" + refundBalanceAmount);
             if (MathUtil.compare(waitRefund, MathUtil.add(refundAmount, refundBalanceAmount)) == 0) {
                 CmRefundShop refundShop = new CmRefundShop();
                 refundShop.setShopID(shopOrder.getShopID().toString());

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

@@ -193,7 +193,7 @@
 							<c:if test="${s.refundAmount > 0}">
 								<span style="color:red">退款：<fmt:formatNumber value="${s.refundAmount}" type="number" pattern="#,##0.00"/></span>，
 							</c:if>
-							待付： <fmt:formatNumber value="${s.wipePayment>0 ? 0 : s.waitPayShop}" type="number" pattern="#,##0.00"/>
+							待付： <fmt:formatNumber value="${s.wipePayment > 0 ? 0 : (s.differenceType eq 1 ? (s.differencePrice + s.waitPayShop):(s.waitPayShop - s.differencePrice))}" type="number" pattern="#,##0.00"/>
 						</div>
 						<c:if test="${s.wipePayment > 0}">
 							<div>

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

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