修改订单统计

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java

@@ -91,7 +91,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
         return result;
     }
 
-    public PageResult<MembersOrderDto> getMemberOrderStatistics(List<BaseUserMemberLevel> memberLevels, OrderQuery query) throws ParseException {
+    public Object getMemberOrderStatistics(List<BaseUserMemberLevel> memberLevels, OrderQuery query) throws ParseException {
 
         List<MembersOrder> membersOrderList = membersBiz.getMemberOrderStatistics(query);
 
@@ -177,8 +177,9 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
 
         //进行分页处理
 
+           return    arrayList;
 
-        return pagingProcessing(query, arrayList);
+//        return pagingProcessing(query, arrayList);
 
     }
 
@@ -192,13 +193,14 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
 
     private void TotalPaymentAndMemberName(HashMap<Integer, String> map, MembersOrder mb, MembersOrderDto mbdto) {
         BigDecimal totalPayment = mbdto.getTotalPayment();
+        totalPayment=BigDecimal.ZERO;
         List<Member> members = mb.getMembers();
         //设置时间段购买会员总金额和不同的会员名称
         if (CollectionUtil.isNotEmpty(members)) {
             mbdto.setMembers(members);
             for (Member member : members) {
                 member.setMemberName(map.get(member.getLevel()));
-                totalPayment = totalPayment.add(member.getAmount());
+                totalPayment = totalPayment.add(member.getAmount()==null?BigDecimal.ZERO:member.getAmount());
             }
         }
     }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java

@@ -140,9 +140,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
         //获取会员等级信息
         List<BaseUserMemberLevel> memberLevels = userFeign.levels();
         //获取会员订单统计信息
-        baseBiz.getMemberOrderStatistics(memberLevels,query);
-
-        return ObjectRestResponse.succ();
+        return ObjectRestResponse.succ( baseBiz.getMemberOrderStatistics(memberLevels,query));
 
     }
 

xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml

@@ -43,10 +43,10 @@
             resultMap="order">
     SELECT
     <if test="type==2">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m') AS period,
+        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v') AS period,
     </if>
     <if test="type==3">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v') AS period,
+        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m') AS period,
     </if>
 	date( FROM_UNIXTIME( a.crt_time / 1000 ) ) AS period,
 	count( a.id ) AS number,
@@ -68,10 +68,10 @@
     </if>
     GROUP BY
     <if test="type==2">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m'),
+        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v'),
     </if>
     <if test="type==3">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v'),
+        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m'),
     </if>
 
 	date( FROM_UNIXTIME( a.crt_time / 1000 ) ),
@@ -80,8 +80,8 @@
     <resultMap id="order" type="com.xxfc.platform.order.entity.MembersOrder">
         <result column="period"  property="period"></result>
          <collection property="members" ofType="com.xxfc.platform.order.pojo.Member">
-             <result column="number"  property="level"></result>
-             <result column="amount"  property="level"></result>
+             <result column="number"  property="number"></result>
+             <result column="amount"  property="amount"></result>
              <result column="level"  property="level"></result>
          </collection>
     </resultMap>