订单付款修改成本与退货

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

@@ -3,11 +3,13 @@ package com.caimei.modules.order.web;
 import com.caimei.dfs.image.beens.ImageUploadInfo;
 import com.caimei.modules.common.utils.UploadUtils;
 import com.caimei.modules.order.dao.CmPayShopRecordDao;
+import com.caimei.modules.order.dao.NewOrderProductDao;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.service.*;
 import com.caimei.modules.sys.utils.UploadImageUtils;
 import com.caimei.modules.user.entity.CmUserOrganize;
 import com.caimei.modules.user.service.CmUserOrganizeService;
+import com.caimei.utils.MathUtil;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.Encodes;
@@ -61,6 +63,8 @@ public class CmPayShopController extends BaseController {
     private CmChangePayShopProductService cmChangePayShopProductService;
     @Autowired
     private CmPayShopRecordDao cmPayShopRecordDao;
+    @Resource
+    private NewOrderProductDao newOrderProductDao;
 
     @ModelAttribute
     public CmPayShop get(@RequestParam(required = false) String id) {
@@ -245,7 +249,7 @@ public class CmPayShopController extends BaseController {
         //子订单的成本方式第一次填写以后就不能修改了
         // 固定成本
         if ("1".equals(costType)) {
-            List<CmReturnedPurchaseProduct> rL = cmReturnedPurchaseProductService.findReturnedByShopOrderID(Integer.parseInt(shopOrderID));
+            // List<CmReturnedPurchaseProduct> rL = cmReturnedPurchaseProductService.findReturnedByShopOrderID(Integer.parseInt(shopOrderID));
             for (NewOrderProduct product : newOrderProducts) {
                 Integer orderProductID = product.getOrderProductID();
                 Double costPrice = product.getCostPrice() == null ? 0d : product.getCostPrice();
@@ -254,15 +258,16 @@ public class CmPayShopController extends BaseController {
                 }
                 Double singleShouldPayTotalTax = product.getSingleShouldPayTotalTax() == null ? 0d : product.getSingleShouldPayTotalTax();
                 Double supplierTaxRate = product.getSupplierTaxRate() == null ? 0d : product.getSupplierTaxRate();
-                // 获取已被退款的商品
-                Optional<CmReturnedPurchaseProduct> o = rL.stream().
-                        filter(r -> r.getOrderProductID().equals(orderProductID)).findAny();
-                CmReturnedPurchaseProduct b = o.isPresent() ? o.get() : null;
-                int returnNum = 0;
-                if (b != null)
-                    returnNum = (b.getActualReturnedNum() == null ? 0 : b.getActualReturnedNum())
-                            + (b.getActualCancelNum() == null ? 0 : b.getActualCancelNum());
-
+                // 获取已被退款的商品数量
+                Integer returnNum = newOrderProductDao.CountReturnedPurchaseProduct(Integer.parseInt(shopOrderID), orderProductID);
+                returnNum = returnNum == null ? 0 : returnNum;
+//                List<CmReturnedPurchaseProduct> o = rL.stream().
+//                        filter(r -> r.getOrderProductID().equals(orderProductID));
+//                CmReturnedPurchaseProduct b = o.isPresent() ? o.get() : null;
+//                int returnNum = 0;
+//                if (b != null)
+//                    returnNum = (b.getActualReturnedNum() == null ? 0 : b.getActualReturnedNum())
+//                            + (b.getActualCancelNum() == null ? 0 : b.getActualCancelNum());
                 NewOrderProduct orderProduct = newOrderProductService.get(String.valueOf(orderProductID));
                 // 修改前
                 if (StringUtils.isEmpty(dbcostType)) {

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

@@ -194,7 +194,7 @@
 					</tr>
 							<c:forEach items="${newShopOrder.newOrderProducts}" var="product" varStatus="index">
 									<tr class="orderProducts">
-										<td hidden><input id="num" name="newOrderProducts[${index.index}].num" value="${product.num}"></td>
+										<td hidden><input id="num" name="newOrderProducts[${index.index}].num" value="${product.num - product.returnedNum}"></td>
 										<td hidden><input id="presentNum" name="newOrderProducts[${index.index}].presentNum" value="${product.presentNum}"></td>
 										<td hidden><input id="name" name="newOrderProducts[${index.index}].name" value="${product.name}"></td>
 										<td hidden><input id="orderProductID" name="newOrderProducts[${index.index}].orderProductID" value="${product.orderProductID}"></td>