Revert "bugfix"

This reverts commit 3811ce0d

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

@@ -402,6 +402,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                             shopOrderReturned.setSendOutStatus(shopOrder.getSendOutStatus());
                             shopOrderReturned.setShopOrderNo(shopOrder.getShopOrderNo());
                             shopOrderReturned.setShopReceiptStatus(shopOrder.getShopReceiptStatus());
+                            shopOrderReturned.setNeedPayAmount(shopOrder.getNeedPayAmount());
                             shopOrderReturned.setEachDiscount(shopOrder.getEachDiscount());
                             shopOrderReturned.setRealPay(shopOrder.getRealPay());
                             shopOrderReturned.setReceiptAmount(shopOrder.getReceiptAmount());

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

@@ -506,7 +506,7 @@
                     <c:if test="${order.onlinePayFlag eq 0}">
                         <tr>
                             <td>
-                                商品总额：￥<fmt:formatNumber type="number" value="${shopOrder.productAmount}" pattern="0.00" maxFractionDigits="2" />
+                                商品总额：￥<fmt:formatNumber type="number" value="${shopOrder.needPayAmount}" pattern="0.00" maxFractionDigits="2" />
                             </td>
                             <td colspan="2">
                                 优惠：￥<fmt:formatNumber type="number" value="${shopOrder.eachDiscount}" pattern="0.00" maxFractionDigits="2" />

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

@@ -406,7 +406,7 @@
                     <c:if test="${order.onlinePayFlag ne 1}">
                         <tr>
                             <td>
-                                商品总额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.productAmount}"
+                                商品总额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.needPayAmount}"
                                                         pattern="0.00" maxFractionDigits="2"/>
                             </td>
                             <td>

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

@@ -524,7 +524,7 @@
                                 <c:if test="${order.onlinePayFlag eq 0}">
                                     <tr>
                                         <td>
-                                            商品总额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.productAmount}" pattern="0.00" maxFractionDigits="2" />
+                                            商品总额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.needPayAmount}" pattern="0.00" maxFractionDigits="2" />
                                         </td>
                                         <td>
                                             优惠：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.eachDiscount}" pattern="0.00" maxFractionDigits="2" />

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

@@ -466,7 +466,7 @@
                         <c:if test="${order.onlinePayFlag ne 1}">
                             <tr>
                                 <td>
-                                    商品总额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.productAmount}" pattern="0.00" maxFractionDigits="2" />
+                                    商品总额：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.needPayAmount}" pattern="0.00" maxFractionDigits="2" />
                                 </td>
                                 <td>
                                     优惠：￥<fmt:formatNumber type="number" value="${shopOrderReturneds.eachDiscount}" pattern="0.00" maxFractionDigits="2" />