PLF 5 lat temu
rodzic
commit
8cfd221d17

+ 18 - 0
src/main/java/com/caimei/entity/CmOrder.java

@@ -61,6 +61,24 @@ public class CmOrder implements Serializable {
     private String refundType;//退货退款类型:1部分退、2全部退
     private List<CmShopOrder> shopOrderList; //子订单集合
     private Long autoCloseTimeMills; //订单自动取消时间 毫秒
+    private Double receiptAmount;      //支付总金额
+    private Double returnedPurchaseFee;     //退款总金额
+
+    public Double getReceiptAmount() {
+        return receiptAmount;
+    }
+
+    public void setReceiptAmount(Double receiptAmount) {
+        this.receiptAmount = receiptAmount;
+    }
+
+    public Double getReturnedPurchaseFee() {
+        return returnedPurchaseFee;
+    }
+
+    public void setReturnedPurchaseFee(Double returnedPurchaseFee) {
+        this.returnedPurchaseFee = returnedPurchaseFee;
+    }
 
     public Integer getOrderID() {
         return orderID;

+ 9 - 1
src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -232,10 +232,18 @@ public class OrderServiceImpl implements OrderService {
                 receiptAmount += discernReceipt.getReceiptAmount();
             }
             //支付总金额
-            map.put("receiptAmount", receiptAmount);
+            order.setReceiptAmount(receiptAmount);
         }
         //退款记录
         List<CmReturnedPurchase> returnedPurchaseList = orderMapper.findReturnedPurchase(order.getOrderID());
+        if (returnedPurchaseList != null && returnedPurchaseList.size() > 0) {
+            Double returnedPurchaseFee = 0d;
+            for (CmReturnedPurchase returnedPurchase : returnedPurchaseList) {
+                returnedPurchaseFee += returnedPurchase.getReturnedPurchaseFee();
+            }
+            //退款总金额
+            order.setReturnedPurchaseFee(returnedPurchaseFee);
+        }
         //客服热线号码
         String cellPhone = loginMapper.cellPhone(order.getOrganizeID());
         //分享码