收款

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

@@ -388,7 +388,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 Double allServeAmount = 0d;
                 for (NewOrderProduct p : orderProductList) {
                     count = newOrderProductDao.CountReturnedPurchaseProduct(so.getShopOrderID(), p.getOrderProductID());
-                    count = count == null ? 0 : p.getNum();
+                    count = count == null ? 0 : count;
                     p.setReturnedNum(count);
                     // 还原下单时商品成本
                     /*Double newCostPrice = 0d;

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

@@ -182,7 +182,7 @@ public class CmRefundShopService extends CrudService<CmRefundShopDao, CmRefundSh
                  */
                 for (NewOrderProduct p : orderProductList) {
                     Integer returnNum = newOrderProductDao.CountReturnedPurchaseProduct(so.getShopOrderID(), p.getOrderProductID());
-                    returnNum = returnNum == null ? 0 : p.getNum();
+                    returnNum = returnNum == null ? 0 : returnNum;
                     p.setReturnedNum(returnNum);
                 }
                 so.setNewOrderProducts(orderProductList);

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

@@ -329,7 +329,7 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             List<NewOrderProduct> orderProductList = newOrderProductDao.findByShopOrderID(so.getShopOrderID());
             for (NewOrderProduct p : orderProductList) {
                 Integer returnNum = newOrderProductDao.CountReturnedPurchaseProduct(so.getShopOrderID(), p.getOrderProductID());
-                returnNum = returnNum == null ? 0 : p.getNum();
+                returnNum = returnNum == null ? 0 : returnNum;
                 p.setReturnedNum(returnNum);
                 // 还原下单时商品成本
                 /*Double newCostPrice = 0d;