Merge branch 'tb-销售统计'

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

@@ -49,10 +49,11 @@ public class MercMiniDeviceDataController {
     @ApiOperation("设备销售数据统计总计")
     public R<DeviceDataDto.SumCountVo> sumCount(@RequestBody @Valid DeviceDataDto.SumCountDto dto) {
         dto.setMercId(MercAuthUtils.getMercId());
-        if (CollUtil.isEmpty(getMercDeviceIds())) {
+        List<Long> mercDeviceIds = getMercDeviceIds();
+        if (CollUtil.isEmpty(mercDeviceIds)) {
             return R.ok(new DeviceDataDto.SumCountVo());
         }
-        dto.setMercDeviceIds(getMercDeviceIds());
+        dto.setMercDeviceIds(mercDeviceIds);
         return R.ok(deviceDataService.sumCount(dto).getData());
     }
 

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

@@ -45,7 +45,7 @@ public class MercMiniDeviceEventController {
         PageBean<DeviceEventMsgDto.Vo> voPageBean = new PageBean<>();
         Long mercId = MercAuthUtils.getMercId();
         page.setMercId(mercId);
-        ArrayList<String> deviceCodes = CollUtil.newArrayList("D01", "M01");
+        ArrayList<String> deviceCodes = CollUtil.newArrayList("D01", "M01", "AISHJ");
         Map<String, SysCodeConfigureRedis> deviceCodeMap = MapUtil.newHashMap();
         deviceCodes.forEach(code -> {
             Map<String, SysCodeConfigureRedis> childrenByParentCode = SysCodeConfigureUtils.getChildrenByParentCode(code);

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

@@ -1,80 +0,0 @@
-package com.xy.controller;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.xy.annotate.RestMappingController;
-import com.xy.dto.DeviceDataDto;
-import com.xy.dto.MercMiniDeviceDto;
-import com.xy.dto.OrderRefundDto;
-import com.xy.service.DeviceDataServiceImpl;
-import com.xy.service.OrderRefundService;
-import com.xy.utils.MercAuthUtils;
-import com.xy.utils.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.Date;
-import java.util.List;
-
-/***
- * 商家端小程序-首页
- * @author 谭斌
- * @date 2023/3/13 14:38
- */
-@Service
-@AllArgsConstructor(onConstructor_ = @Autowired)
-@Api(tags = "商家端小程序-首页")
-@RestMappingController("merc-mini/homepage")
-public class MercMiniDeviceHomePageController {
-
-    private DeviceDataServiceImpl deviceDataService;
-    private OrderRefundService refundService;
-
-
-    @PostMapping("count")
-    @ApiOperation("首页统计")
-    public R<MercMiniDeviceDto.HomePageVO> homepageCount() {
-        MercMiniDeviceDto.HomePageVO vo = new MercMiniDeviceDto.HomePageVO();
-        Long mercId = MercAuthUtils.getMercId();
-        //当天
-        MercMiniDeviceDto.DayCountVO day = new MercMiniDeviceDto.DayCountVO().setOrderNum(0).setSalesPrice(0).setRefundMoney(0);
-        List<DeviceDataDto.Vo> mercDataOneDay = deviceDataService.getMercDataOneDay(mercId, DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN));
-        if (CollUtil.isNotEmpty(mercDataOneDay)) {
-            //今日退款成功订单金额
-            OrderRefundDto.CountByDateVO countByDateVO = R.feignCheckData(refundService.countByDate(new OrderRefundDto.CountByDateDTO().setDate(DateTime.now()).setMercId(mercId)));
-            Integer hisRefundMoney = countByDateVO.getHisRefundMoney();
-            Integer todayRefundMoney = countByDateVO.getTodayRefundMoney();
-            //今日销售额 （扣除今日的订单的退款金额）
-            day.setDayHisRefundMoney(hisRefundMoney);
-            day.setDayRefundMoney(todayRefundMoney);
-            //改为和更多数据中的今日收益一样
-            day.setSalesPrice(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getSalesMoney).sum() - todayRefundMoney);
-            day.setOrderNum(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getSalesCount).sum());
-            day.setRefundMoney(hisRefundMoney + todayRefundMoney);
-        }
-        vo.setDay(day);
-        //当月
-        MercMiniDeviceDto.MonthCountVO month = new MercMiniDeviceDto.MonthCountVO().setOrderNum(0).setSalesPrice(0).setRefundMoney(0);
-        List<DeviceDataDto.Vo> mercDataOneMonth = deviceDataService.getMercDataOneMonth(mercId, DateUtil.format(new Date(), DatePattern.SIMPLE_MONTH_PATTERN));
-        if (CollUtil.isNotEmpty(mercDataOneMonth)) {
-            OrderRefundDto.CountByMonthVO countByMonthVO = R.feignCheckData(refundService.countByMonth(new OrderRefundDto.CountByMonthDTO().setCurMonthDate(DateTime.now()).setMercId(mercId)));
-            Integer hisMonthRefundMoney = countByMonthVO.getHisMonthRefundMoney();
-            Integer monthRefundMoney = countByMonthVO.getMonthRefundMoney();
-            month.setSalesPrice(mercDataOneMonth.stream().mapToInt(DeviceDataDto.Vo::getSalesMoney).sum() - monthRefundMoney);
-            month.setOrderNum(mercDataOneMonth.stream().mapToInt(DeviceDataDto.Vo::getSalesCount).sum());
-            month.setRefundMoney(hisMonthRefundMoney + monthRefundMoney);
-            month.setMonthRefundMoney(monthRefundMoney);
-            month.setMonthHisRefundMoney(hisMonthRefundMoney);
-        }
-        vo.setMonth(month);
-        return R.ok(vo);
-    }
-
-
-}

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

@@ -211,11 +211,30 @@ public class MercMiniDeviceDto {
         @ApiModelProperty("退款金额")
         private Integer refundMoney;
 
-        @ApiModelProperty("今日产生的订单发生退款金额")
-        private Integer dayRefundMoney;
+        @ApiModelProperty("订单金额")
+        private Integer orderTotalMoney;
+
+        @ApiModelProperty(name = "退款订单数")
+        private Integer refundOrdersSize;
+
+
+        @ApiModelProperty(name = "补收金额")
+        private Integer cutPayMoney;
+
+
+        @ApiModelProperty(name = "补收订单数")
+        private Integer cutOrdersSize;
+
+
+        @ApiModelProperty(name = "补退金额")
+        private Integer cutRefundMoney;
+
+        @ApiModelProperty(name = "补退订单数")
+        private Integer cutRefundOrdersSize;
+
+        @ApiModelProperty(value = "到账金额=付款金额-退款金额")
+        private Integer dayOrderRealMoney;
 
-        @ApiModelProperty("在今日退款的历史订单发生的退款金额")
-        private Integer dayHisRefundMoney;
 
     }
 
@@ -233,13 +252,6 @@ public class MercMiniDeviceDto {
         private Integer refundMoney;
 
 
-        @ApiModelProperty("当月产生的订单发生退款金额")
-        private Integer monthRefundMoney;
-
-        @ApiModelProperty("在当月退款的历史订单发生的退款金额")
-        private Integer monthHisRefundMoney;
-
-
     }