修改计算方式

src/main/java/com/usky/dxtop/model/Order.java

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * <p>
@@ -68,7 +69,7 @@ public class Order extends BaseEntity implements Serializable {
     /**
      * 充值金额
      */
-    private Double money;
+    private BigDecimal money;
 
     private boolean delFlag;
 

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -117,7 +117,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 .between(null != orderRequest.getStartMoney() && null != orderRequest.getEndMoney(),
                         Order::getMoney,orderRequest.getStartMoney(),orderRequest.getEndMoney())
                 .between(null != orderRequest.getStartTime() && null != orderRequest.getEndTime(),
-                        Order::getCreateTime,orderRequest.getStartMoney(),orderRequest.getEndTime())
+                        Order::getCreateTime,orderRequest.getStartTime(),orderRequest.getEndTime())
                 .eq(null != orderRequest.getOrderFlag(),Order::getOrderFlag,orderRequest.getOrderFlag());
         page = this.page(page, queryWrapper);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
@@ -135,7 +135,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         String orderNumber = TopApi.getOrderNumber();
         order.setOrderNumber(orderNumber);
         TreeMap<String, String> params = TopApi.generateScanPayApiParam(order.getOrderNumber(),
-                                        new Double(Arith.mul(order.getMoney(),100)).intValue(), null,
+                                        new Double(Arith.mul(order.getMoney().doubleValue(),100)).intValue(), null,
                 null,null,null,null,null,null);
         baseMapper.insert(order);
         //记录调用日志
@@ -192,7 +192,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         try {
             ChargeVO chargeVo = new ChargeVO();
             chargeVo.setSeq(order.getId());
-            chargeVo.setAmt(order.getMoney());
+            chargeVo.setAmt(order.getMoney().doubleValue());
             chargeVo.setCard("h");
             chargeVo.setMob(order.getOrderNumber());
             chargeVo.setName("test");
@@ -375,7 +375,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if ("W06".equals(order.getTopPayType())){
             appId = TopApi.WX_APP_ID;
         }
-        TreeMap<String, String> params = TopApi.generateUnifyParam(orderNumber,new Double(Arith.mul(order.getMoney(),100)).intValue(),
+        TreeMap<String, String> params = TopApi.generateUnifyParam(orderNumber,new Double(Arith.mul(order.getMoney().doubleValue(),100)).intValue(),
                 null, null,
                 null,null,null,order.getTopPayType(),null,appId,
                 null,null,null,null);

src/main/resources/mapper/OrderMapper.xml

@@ -24,9 +24,9 @@
     (SELECT
     DATE(create_time) reportDate,
     sum(money) as totalMoney,
-    sum(if(pay_type = '1', 1, 0)) as cashMoney,
-    sum(if(pay_type = '2', 1, 0)) as wxMoney,
-    sum(if(pay_type = '3', 1, 0)) as zfbMoney
+    sum(if(pay_type = '1', money, 0)) as cashMoney,
+    sum(if(pay_type = '2', money, 0)) as wxMoney,
+    sum(if(pay_type = '3', money, 0)) as zfbMoney
     FROM
     t_order
         <where>
@@ -43,9 +43,9 @@
         (SELECT
         WEEK(create_time) reportDate,
         sum(money) as totalMoney,
-        sum(if(pay_type = '1', 1, 0)) as cashMoney,
-        sum(if(pay_type = '2', 1, 0)) as wxMoney,
-        sum(if(pay_type = '3', 1, 0)) as zfbMoney
+        sum(if(pay_type = '1', money, 0)) as cashMoney,
+        sum(if(pay_type = '2', money, 0)) as wxMoney,
+        sum(if(pay_type = '3', money, 0)) as zfbMoney
         FROM
         t_order
         <where>
@@ -61,11 +61,11 @@
         select *
         from
         (SELECT
-        month(create_time) reportDate,
+        YEAR(create_time) reportDate,
         sum(money) as totalMoney,
-        sum(if(pay_type = '1', 1, 0)) as cashMoney,
-        sum(if(pay_type = '2', 1, 0)) as wxMoney,
-        sum(if(pay_type = '3', 1, 0)) as zfbMoney
+        sum(if(pay_type = '1', money, 0)) as cashMoney,
+        sum(if(pay_type = '2', money, 0)) as wxMoney,
+        sum(if(pay_type = '3', money, 0)) as zfbMoney
         FROM
         t_order
         <where>
@@ -80,11 +80,11 @@
         select *
         from
         (SELECT
-        YEAR(create_time) reportDate,
+        month(create_time) reportDate,
         sum(money) as totalMoney,
-        sum(if(pay_type = '1', 1, 0)) as cashMoney,
-        sum(if(pay_type = '2', 1, 0)) as wxMoney,
-        sum(if(pay_type = '3', 1, 0)) as zfbMoney
+        sum(if(pay_type = '1', money, 0)) as cashMoney,
+        sum(if(pay_type = '2', money, 0)) as wxMoney,
+        sum(if(pay_type = '3', money, 0)) as zfbMoney
         FROM
         t_order
         <where>