创米需求

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

@@ -212,6 +212,7 @@ public class MercMiniDeviceController {
             if (Emptys.check(mercPlace)) {
                 vo.setDistrictName(mercPlace.getRegionName());
                 vo.setPlaceName(mercPlace.getPlaceName());
+                vo.setPlaceImgs(mercPlace.getImgs());
             }
 
             // 返显区域名称

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

@@ -1670,6 +1670,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             dayData.setSalesMoney(successVo.getOrderTotalMoney());
             dayData.setRefundMoney(successVo.getRefundMoney());
             dayData.setSalesCount(successVo.getOrdersSize());
+            dayData.setProfit(successVo.getProfit());
         }
 
 
@@ -1690,6 +1691,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             monthData.setRefundMoney(successVoM.getRefundMoney());
             monthData.setSalesMoney(successVoM.getOrderTotalMoney());
             monthData.setSalesCount(successVoM.getOrdersSize());
+            monthData.setProfit(successVoM.getProfit());
         }
         vo.setDayBusinessData(copy(DeviceInfoDto.BusinessData.class, dayData));
         vo.setMonthBusinessData(copy(DeviceInfoDto.BusinessData.class, monthData));
@@ -1998,6 +2000,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     MercPlaceDto.Vo placeVo = placeMap.get(placeId);
                     if (placeVo != null) {
                         record.setDistrictName(placeVo.getRegionName());
+                        record.setPlaceImgs(placeVo.getImgs());
 //                        record.setPlaceName(placeVo.getPlaceName());
                     }
                 }

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

@@ -314,6 +314,9 @@ public class DeviceDataDto {
         @ApiModelProperty(value = "设备故障数")
         private Integer deviceFaultCount;
 
+        @ApiModelProperty(value = "利润")
+        private Integer profit;
+
         @ApiModelProperty(value = "创建时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;

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

@@ -1407,6 +1407,12 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "0元订单笔数")
         private Integer zeroCount;
 
+        @ApiModelProperty(value = "利润")
+        private Integer profit;
+
+        public Integer getProfit() {
+            return profit == null ? 0 : profit;
+        }
     }
 
     /**

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

@@ -261,6 +261,9 @@ public class MercMiniDeviceDto {
         @ApiModelProperty(value = "昨日毛利率 （销售额-成本）/销售额")
         private BigDecimal hisGrossProfitMargin;
 
+        @ApiModelProperty(value = "今日利润")
+        private Integer dayProfit;
+
 
     }
 
@@ -277,6 +280,9 @@ public class MercMiniDeviceDto {
         @ApiModelProperty("退款金额")
         private Integer refundMoney;
 
+        @ApiModelProperty(value = "本月利润")
+        private Integer monthProfit;
+
 
     }