bug fixes

src/main/java/com/caimei/entity/CmDiscernReceipt.java

@@ -36,6 +36,15 @@ public class CmDiscernReceipt implements Serializable {
     private String cancelDate;    //撤销时间
     private String updateDate;    //更新操作时间
     private String delFlag;     //作废标记 0 否，其余是
+    private Double associateAmount; //单次收款金额
+
+    public Double getAssociateAmount() {
+        return associateAmount;
+    }
+
+    public void setAssociateAmount(Double associateAmount) {
+        this.associateAmount = associateAmount;
+    }
 
     public Integer getId() {
         return id;

src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -233,7 +233,7 @@ public class OrderServiceImpl implements OrderService {
         if (discernReceiptList != null && discernReceiptList.size() > 0) {
             Double receiptAmount = 0d;
             for (CmDiscernReceipt discernReceipt : discernReceiptList) {
-                receiptAmount += discernReceipt.getReceiptAmount();
+                receiptAmount += discernReceipt.getAssociateAmount();
             }
             //支付总金额
             order.setReceiptAmount(receiptAmount);
@@ -243,7 +243,7 @@ public class OrderServiceImpl implements OrderService {
         if (returnedPurchaseList != null && returnedPurchaseList.size() > 0) {
             Double returnedPurchaseFee = 0d;
             for (CmReturnedPurchase returnedPurchase : returnedPurchaseList) {
-                returnedPurchaseFee += returnedPurchase.getReturnedPurchaseFee();
+                returnedPurchaseFee += returnedPurchase.getRefundFee();
             }
             //退款总金额
             order.setReturnedPurchaseFee(returnedPurchaseFee);

src/main/resources/mapper/OrderMapper.xml

@@ -303,7 +303,7 @@
 
     <select id="findDiscernReceipt" parameterType="int" resultType="com.caimei.entity.CmDiscernReceipt">
         SELECT
-          cdr.*
+          cdr.*,cror.associateAmount
         FROM
           cm_receipt_order_relation cror
           LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id