财务统计修改

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DmDealer.java

@@ -55,9 +55,9 @@ public class DmDealer  implements  Serializable{
     //渠道名称
     private String dealChannelName;
     //订单总额
-    private Integer itemTotal;
+    private String itemTotal;
     //已认领金额
-    private Integer claimOrderTotal;
+    private String claimOrderTotal;
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date startDate;                 //开始时间
@@ -250,19 +250,19 @@ public class DmDealer  implements  Serializable{
         this.dealChannelName = dealChannelName;
     }
 
-    public Integer getItemTotal() {
+    public String getItemTotal() {
         return itemTotal;
     }
 
-    public void setItemTotal(Integer itemTotal) {
+    public void setItemTotal(String itemTotal) {
         this.itemTotal = itemTotal;
     }
 
-    public Integer getClaimOrderTotal() {
+    public String getClaimOrderTotal() {
         return claimOrderTotal;
     }
 
-    public void setClaimOrderTotal(Integer claimOrderTotal) {
+    public void setClaimOrderTotal(String claimOrderTotal) {
         this.claimOrderTotal = claimOrderTotal;
     }
 
@@ -281,4 +281,12 @@ public class DmDealer  implements  Serializable{
     public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dmDealerMapper.xml

@@ -231,8 +231,8 @@
             t.dealer_name,
             ddc.deal_channel_name,
             dcs.store_id,
-            SUM(soix.item_total) as itemTotal,
-            xx.claim_order_total as claimOrderTotal
+            cast(round(SUM(soix.item_total)/100,2)   as   decimal(11,2))  as itemTotal,
+            cast(round(xx.claim_order_total/100,2)   as   decimal(11,2)) as claimOrderTotal
         FROM tb_rst_dm_dealer t
         LEFT JOIN tb_rst_sys_admin sa ON sa.admin_id = t.create_id
         LEFT JOIN tb_rst_dm_dealer_channel ddc ON ddc.dealer_id = t.dealer_id

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/fr_statistics.ftl

@@ -59,8 +59,8 @@
                     <td>
                          ${dmDealer.dealChannelName!''}
                     </td>
-                    <td>${((dmDealer.itemTotal/100)?string("0.##"))!'0'}</td>
-                    <td>${((dmDealer.claimOrderTotal/100)?string("0.##"))!'0'}</td>
+                    <td>${(dmDealer.itemTotal)!'0'}</td>
+                    <td>${(dmDealer.claimOrderTotal)!'0'}</td>
 <#--
                     <td>
                         <a style="text-decoration:none" href="javascript:void(0);" title="订单详情" alt="订单详情" onclick="sales_order_detail(${order.salesId!''})">