Merge remote-tracking branch 'origin/master'

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceDataController.java

@@ -35,4 +35,11 @@ public class MercMiniDeviceDataController {
         dto.setMercId(MercAuthUtils.getMercId());
         return R.ok(deviceDataService.sumPage(dto).getData());
     }
+
+    @PostMapping("sumCount")
+    @ApiOperation("设备销售数据统计总计")
+    public R<DeviceDataDto.SumCountVo> sumCount(@RequestBody @Valid DeviceDataDto.SumCountDto dto){
+        dto.setMercId(MercAuthUtils.getMercId());
+        return R.ok(deviceDataService.sumCount(dto).getData());
+    }
 }

device-api-service/src/main/java/com/xy/service/DeviceDataServiceImpl.java

@@ -52,7 +52,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
 
     private final DeviceInfoServiceImpl deviceInfoService;
     @PostMapping("sumPage")
-    @ApiOperation("商品销售统计")
+    @ApiOperation("设备销售统计")
     public R<PageBean<DeviceDataDto.SumPageVo>> sumPage(@RequestBody @Valid DeviceDataDto.SumPageDto dto) {
         PageBean pageBean = dto.getPage();
         String salesCount = StringTools.humpToLine(LambdaUtils.getProperty(DeviceData::getSalesCount));
@@ -72,7 +72,6 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
                 .orderByAsc("asc".equals(dto.getOrderBy()), dto.getOrderByKey())
                 .orderByDesc("desc".equals(dto.getOrderBy()), dto.getOrderByKey())
                 .lambda()
-                .select()
                 .eq(Emptys.check(dto.getMercId()),DeviceData::getMercId, dto.getMercId())
                 .eq(DeviceData::getType, dto.getType())
                 .ge(Emptys.check(dto.getBeginDate()), DeviceData::getDateValue, dto.getBeginDate())
@@ -90,6 +89,31 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
         }
         return R.ok();
     }
+
+    @PostMapping("sumCount")
+    @ApiOperation("设备销售统计总计")
+    public R<DeviceDataDto.SumCountVo> sumCount(@RequestBody @Valid DeviceDataDto.SumCountDto dto) {
+        String salesCount = StringTools.humpToLine(LambdaUtils.getProperty(DeviceData::getSalesCount));
+        String salesMoney = StringTools.humpToLine(LambdaUtils.getProperty(DeviceData::getSalesMoney));
+        String goodsCount = StringTools.humpToLine(LambdaUtils.getProperty(DeviceData::getGoodsCount));
+        String refundMoney = StringTools.humpToLine(LambdaUtils.getProperty(DeviceData::getRefundMoney));
+        String refundCount = StringTools.humpToLine(LambdaUtils.getProperty(DeviceData::getRefundCount));
+        String riskCount = StringTools.humpToLine(LambdaUtils.getProperty(DeviceData::getRiskCount));
+        String zeroCount = StringTools.humpToLine(LambdaUtils.getProperty(DeviceData::getZeroCount));
+        //查询总数
+        LambdaQueryWrapper<DeviceData> lqw = new QueryWrapper<DeviceData>()
+                .select(String.format("sum(%s) %s,sum(%s) %s,sum(%s) %s,sum(%s) %s,sum(%s) %s,sum(%s) %s,sum(%s) %s"
+                        , salesCount, salesCount, salesMoney, salesMoney, goodsCount, goodsCount
+                        ,refundMoney,refundMoney,refundCount,refundCount,riskCount,riskCount,zeroCount,zeroCount
+                ))
+                .lambda()
+                .eq(Emptys.check(dto.getMercId()),DeviceData::getMercId, dto.getMercId())
+                .eq(DeviceData::getType, dto.getType())
+                .ge(Emptys.check(dto.getBeginDate()), DeviceData::getDateValue, dto.getBeginDate())
+                .le(Emptys.check(dto.getEndDate()), DeviceData::getDateValue, dto.getEndDate());
+        return R.ok(copy(DeviceDataDto.SumCountVo.class,getOne(lqw)));
+    }
+
     @PostMapping("obj")
     @ApiOperation("对象查询")
     public R<DeviceDataDto.Vo> obj(@RequestBody DeviceDataDto.Vo vo) {

device-api/src/main/java/com/xy/dto/DeviceDataDto.java

@@ -25,14 +25,34 @@ public class DeviceDataDto {
 
     @Data
     @Accessors(chain = true)
-    public static class SumPageDto{
+    public static class SumCountVo{
+        @ApiModelProperty(value = "营业额;单位分")
+        private Integer salesMoney;
+
+        @ApiModelProperty(value = "销售笔数")
+        private Integer salesCount;
+
+        @ApiModelProperty(value = "销售商品数")
+        private Integer goodsCount;
+
+        @ApiModelProperty(value = "退款金额;单位分")
+        private Integer refundMoney;
+
+        @ApiModelProperty(value = "退款笔数")
+        private Integer refundCount;
+
+        @ApiModelProperty(value = "风险订单数")
+        private Integer riskCount;
+
+        @ApiModelProperty(value = "0元订单笔数")
+        private Integer zeroCount;
+    }
+    @Data
+    @Accessors(chain = true)
+    public static class SumCountDto{
         @ApiModelProperty(value = "商户ID",required = true)
         private Long mercId;
 
-        @NotNull(message = "分页信息不能为空")
-        @ApiModelProperty(value = "分页信息",required = true)
-        private PageBean page;
-
         @NotNull(message = "统计类型不能为空")
         @ApiModelProperty(value = "统计类型",required = true)
         private String type;
@@ -59,13 +79,21 @@ public class DeviceDataDto {
         }
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class SumPageDto extends SumCountDto{
+        @NotNull(message = "分页信息不能为空")
+        @ApiModelProperty(value = "分页信息",required = true)
+        private PageBean page;
+    }
+
     @Data
     @Accessors(chain = true)
     public static class SumPageVo {
         @ApiModelProperty(value = "平台商品id")
         private Long deviceId;
 
-        @ApiModelProperty(value = "商品名称")
+        @ApiModelProperty(value = "设备名称")
         private String deviceName;
 
         @ApiModelProperty(value = "营业额;单位分")
@@ -77,14 +105,17 @@ public class DeviceDataDto {
         @ApiModelProperty(value = "销售商品数")
         private Integer goodsCount;
 
-        @ApiModelProperty(value = "退款金额")
+        @ApiModelProperty(value = "退款金额;单位分")
         private Integer refundMoney;
 
         @ApiModelProperty(value = "退款笔数")
         private Integer refundCount;
 
-        @ApiModelProperty(value = "退款笔数")
-        private Integer refundGoodsCount;
+        @ApiModelProperty(value = "风险订单数")
+        private Integer riskCount;
+
+        @ApiModelProperty(value = "0元订单笔数")
+        private Integer zeroCount;
     }
     @Data
     @Accessors(chain = true)