3月3日提交代码-liubolan

app/src/main/java/mtp/polymer/com/information_management/hnstocks/main/order/MainOrderPaymentViewHolder.kt

@@ -207,7 +207,7 @@ class MainOrderPaymentViewHolder(private val activity: MyAppCompatActivity, priv
 
                 textView {
                     data.bindOptional(context){
-                        text = "总价 " + it?.currencysign  + Utils.roundNum(it?.tradeamount, 2)
+                        text = "总价 " + Utils.roundNum(it?.originalamount, 2)
                     }
                     textSizeAuto = 26
                     textColorInt = R.color.p_global_black_color

app/src/main/java/mtp/polymer/com/information_management/hnstocks/main/order/OrderData.java

@@ -110,6 +110,7 @@ public class OrderData {
         private String tradedate;//交易日(yyyyMMdd)
         private String tradeid;//成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
         private String customername;//客户名称(企业名称)，已脱敏
+        private String originalamount;//总价
 
 
         protected dataList(Parcel in) {
@@ -160,6 +161,7 @@ public class OrderData {
             tradedate = in.readString();
             tradeid = in.readString();
             customername = in.readString();
+            originalamount = in.readString();
         }
 
         public static final Creator<dataList> CREATOR = new Creator<dataList>() {
@@ -174,6 +176,14 @@ public class OrderData {
             }
         };
 
+        public String getOriginalamount() {
+            return originalamount;
+        }
+
+        public void setOriginalamount(String originalamount) {
+            this.originalamount = originalamount;
+        }
+
         public String getCustomername() {
             return customername;
         }
@@ -606,6 +616,7 @@ public class OrderData {
             parcel.writeString(tradedate);
             parcel.writeString(tradeid);
             parcel.writeString(customername);
+            parcel.writeString(originalamount);
         }
     }
 }