支付采美后台part3

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

@@ -442,12 +442,12 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                     for (NewOrderProduct orderProduct : shopOrder.getNewOrderProducts()) {
                         productName.append(orderProduct.getName());
                         // 没有折扣时促销才生效
-                        if (orderProduct.getDiscount() >= 100d && !onlinePay) {
+                        if (orderProduct.getDiscount() >= 100d) {
                             if (null != promotionsList && promotionsList.size() > 0) {
                                 for (CmPromotion promotion : promotionsList) {
                                     if ("3".equals(promotion.getType())) {
                                         shopOrder.setOrderPromotionsId(orderProduct.getOrderPromotionsId());
-                                        if ("2".equals(promotion.getMode())) {
+                                        if ("2".equals(promotion.getMode()) && !onlinePay) {
                                             promotionsTouchPrice = promotion.getTouchPrice();
                                             promotionsReducedPrice = promotion.getReducedPrice();
                                             shopTouchPrice += (orderProduct.getNum() * orderProduct.getPrice());

src/main/java/com/caimei/modules/order/utils/OrderUtil.java

@@ -146,11 +146,11 @@ public class OrderUtil {
         double svipShopReduction = 0d;
         for (NewOrderProduct o : orderProducts) {
             // 没有折扣时促销才生效
-            if (o.getDiscount() == 100d && onlinePay) {
+            if (o.getDiscount() == 100d) {
                 for (CmPromotion promotion : promotionsList) {
                     if ("3".equals(promotion.getType())) {
                         shopOrder.setOrderPromotionsId(o.getOrderPromotionsId());
-                        if ("2".equals(promotion.getMode())) {
+                        if ("2".equals(promotion.getMode()) && !onlinePay) {
                             promotionsTouchPrice = promotion.getTouchPrice();
                             promotionsReducedPrice = promotion.getReducedPrice();
                             shopTouchPrice += (o.getNum() * o.getPrice());

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

@@ -331,8 +331,6 @@
                     <div class="shop-order-row">
                         <c:forEach items="${orderInfo.shopOrderInfos}" var="shopOrder" varStatus="index">
                             <span>子订单编号：${shopOrder.shopOrderNo}(${shopOrder.shopOrderID})</span>
-                            <span>子订单金额：¥<fmt:formatNumber value="${shopOrder.realPay}"
-                                                           pattern="#0.00"/></span>
                             <span>子订单应收金额：¥<fmt:formatNumber value="${shopOrder.realPay}"
                                                            pattern="#0.00"/></span>
                             <span>子订单已收金额：¥<fmt:formatNumber value="${shopOrder.receiptAmount}"