修正取金额的bug3

src/main/java/cn/chjyj/szwh/bean/Order.java

@@ -25,8 +25,7 @@ public class Order implements Serializable {
     private String historyBuyName; // 历史购买方名称
     private String historyBuyCode; // 历史购买方组织机构代码
     private BigDecimal totalServiceCharge; //订单服务费金额
-    private BigDecimal goodsPrice;// 订单价格
-    private BigDecimal totalMoney; //订单总金额 包含服务费
+    private BigDecimal totalMoney; //订单总金额
     private Integer type;//订单类型；1：委托订单；2：认证订单；3：服务订单
     private Integer status;//订单状态；1：待付款；2：待交付；3：待结算；4：已完成；5：已关闭；
     private String transactionIslicode; //交易isli标识码
@@ -115,14 +114,6 @@ public class Order implements Serializable {
         this.totalServiceCharge = totalServiceCharge;
     }
 
-    public BigDecimal getGoodsPrice() {
-        return goodsPrice;
-    }
-
-    public void setGoodsPrice(BigDecimal goodsPrice) {
-        this.goodsPrice = goodsPrice;
-    }
-
     public BigDecimal getTotalMoney() {
         return totalMoney;
     }

src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java

@@ -306,8 +306,8 @@ public class OrderServiceImpl implements OrderService {
         // 订单基础信息 todo fix
         Map bsodmap = new HashMap();
         Order bsod = orderMapper.getOrderByBatchcode(bathcode);
-        bsodmap.put("goods_price",bsod.getGoodsPrice());
-        bsodmap.put("total_service_charge",bsod.getTotalServiceCharge());
+        bsodmap.put("goods_price",bsod.getTotalMoney());
+        bsodmap.put("total_service_charge",bsod.getTotalServiceCharge().toString());
         retmap.put("order",bsodmap);
 
 
@@ -390,7 +390,7 @@ public class OrderServiceImpl implements OrderService {
         odinfoMap.put("price",price);
         odinfoMap.put("transaction_count",transactionCount);
         odinfoMap.put("earnest_money",earnestMoney);
-
+        odinfoMap.put("total_money",bsod.getTotalMoney());
         retmap.put("order_info",odinfoMap);
 
         //购买者

src/main/resources/mapper/szwh/OrderMapper.xml

@@ -6,7 +6,7 @@
 
     <sql id="column">
       cast(id as char) as id,user_id as userId,buy_islicode as buyIslicode,batchcode,account_ratio_id as accountRatioId,
-      history_buy_name as historyBuyName,goods_price as goodsPrice
+      history_buy_name as historyBuyName,
       history_buy_code as historyBuyCode,total_service_charge as totalServiceCharge,total_money as totalMoney,
       `type`,`status`,transaction_islicode as transactionIslicode,ticketid,ticketmoney,ticketurl,ticketimage,
       ticket_status as ticketStatus,charge_channel as chargeChannel,pay_status as payStatus,close_status as closeStatus,