bugfix-供应商退款

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

@@ -167,10 +167,11 @@ public class CmRefundShopService extends CrudService<CmRefundShopDao, CmRefundSh
                     so.setRefundsAmount(0d);
                 }
                 //查询收款供应商退款金额
-                BigDecimal shopRefundAmount = cmRefundShopRecordDao.findShopRefund(so.getShopOrderID());
+                /*BigDecimal shopRefundAmount = cmRefundShopRecordDao.findShopRefund(so.getShopOrderID());
                 BigDecimal refundsAmount = MathUtil.add(so.getRefundsAmount(), shopRefundAmount);
-                so.setRefundsAmount(refundsAmount.doubleValue());
-                BigDecimal payAmount = MathUtil.sub(so.getPayedShopAmount(), refundsAmount);
+                so.setRefundsAmount(refundsAmount.doubleValue());*/
+                // 实际已付金额=已付金额-已退金额
+                BigDecimal payAmount = MathUtil.sub(so.getPayedShopAmount(), so.getRefundAmount());
                 refundAmount = MathUtil.add(refundAmount, payAmount).doubleValue();
                 List<NewOrderProduct> orderProductList = newOrderProductDao.findByShopOrderID(so.getShopOrderID());
                 /*