今日菜品和菜品评价

eladmin-system/src/main/java/me/zhengjie/config/rabbitmq/test/ListenerTemplate.java

@@ -16,6 +16,7 @@ import me.zhengjie.modules.dm.food.domain.DmFood;
 import me.zhengjie.modules.dm.food.repository.DmFoodRepository;
 import me.zhengjie.modules.dm.food.service.DmFoodService;
 import me.zhengjie.modules.dm.foodCate.domain.DmFoodCate;
+import me.zhengjie.modules.dm.foodCate.repository.DmFoodCateRepository;
 import me.zhengjie.modules.dm.order.domain.DmOrderItem;
 import me.zhengjie.modules.dm.order.domain.DmOrderPayment;
 import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
@@ -37,6 +38,8 @@ public class ListenerTemplate {
     DmDayPcRepository dmDayPcRepository;
     @Autowired
     DmFoodRepository dmFoodRepository;
+    @Autowired
+    DmFoodCateRepository dmFoodCateRepository;
 //    @Autowired
 //    DmOrderRecordService dmOrderRecordService;
 //    @Autowired
@@ -68,7 +71,9 @@ public class ListenerTemplate {
                 dmDayPc.setName(attendance.getString("name"));
                 DmFoodCate dmFoodCate = new DmFoodCate();
                 dmFoodCate.setId(attendance.getInteger("cate"));
-                dmDayPc.setCate(dmFoodCate);
+                DmFoodCate cate = dmFoodCateRepository.findByCateId(attendance.getInteger("cate"));
+                dmFoodCate.setCateId(attendance.getInteger("cate"));
+                dmDayPc.setCate(cate);
                 dmDayPc.setPid(attendance.getLong("pid"));
                 dmDayPc.setGoods(attendance.getString("goods"));
                 dmDayPc.setBarcode(attendance.getString("barcode"));

eladmin-system/src/main/java/me/zhengjie/modules/dm/order/repository/DmOrderRecordRepository.java

@@ -23,6 +23,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
@@ -90,4 +91,16 @@ public interface DmOrderRecordRepository extends JpaRepository<DmOrderRecord, Lo
      */
     @Query(value = "SELECT SUM(amt) FROM dm_order_record ",nativeQuery = true)
     Integer countOrderAmt();
+    /**
+     * 食堂营业额
+     * @return
+     */
+    @Query(value = "SELECT SUM(amt) FROM dm_order_record where DATE_FORMAT(create_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d') ",nativeQuery = true)
+    BigDecimal countOrderAmtByNow();
+    /**
+     * 食堂消费人数
+     * @return
+     */
+    @Query(value = "SELECT COUNT(DISTINCT(mob)) FROM dm_order_record where DATE_FORMAT(create_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d') ",nativeQuery = true)
+    Integer countOrderPersonByNow();
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/service/repository/DmServicePjRepository.java

@@ -26,6 +26,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -58,4 +59,10 @@ public interface DmServicePjRepository extends JpaRepository<DmServicePj, Intege
             " `fl_point`, `fwtd_point`, `hjws_point`, `zhfw_point`, `cxgj_point`, `remark`, `enabled` FROM dm_service_pj " +
             "WHERE user_code = ?1 and date_format( pj_time, '%Y-%m-%d' ) = date_format(now(),'%Y-%m-%d')",nativeQuery = true)
     Map<String,Object> getDmServicePjByUserCodeAndPjTime(String userCode);
+
+    @Query(value = "SELECT COUNT(DISTINCT(user_code)) as num,AVG(zhfw_point) as point FROM dm_service_pj WHERE DATE_FORMAT(pj_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')",nativeQuery = true)
+    Map<String,Object> getDmServicePjByNow();
+
+    @Query(value = "SELECT * FROM dm_service_pj WHERE DATE_FORMAT(pj_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')",nativeQuery = true)
+    List<DmServicePj> getDmServicePjContentByNow();
 }

eladmin-system/src/main/java/me/zhengjie/modules/dmApp/repository/AppFoodPjRepository.java

@@ -24,6 +24,6 @@ public interface AppFoodPjRepository extends JpaRepository<AppFoodPj,String>, Jp
             "l.url as picture,user_code FROM dm_order_item a inner JOIN dm_food b ON a.pid = b.id " +
             "LEFT JOIN dm_order_record c ON a.bh=c.bh LEFT JOIN dm_food_cate d ON b.type = d.cate_id " +
             "LEFT JOIN tool_local_storage l ON d.url = l.storage_id WHERE c.card=:cardid " +
-            "and a.pj_type='0' and date_format( create_date, '%Y-%m-%d' ) = date_format(now(),'%Y-%m-%d') ")
+            "and a.pj_type='0' and date_format( c.create_date, '%Y-%m-%d' ) = date_format(now(),'%Y-%m-%d') ")
     List<AppFoodPj> selectAppFoodPj (@Param("cardid") String cardid);
 }

eladmin-system/src/main/java/me/zhengjie/modules/thirdparty/v1/OpenApiController.java

@@ -24,6 +24,7 @@ import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
 import me.zhengjie.modules.dm.order.repository.DmOrderItemRepository;
 import me.zhengjie.modules.dm.order.repository.DmOrderRecordRepository;
 import me.zhengjie.modules.dm.service.domain.DmServicePj;
+import me.zhengjie.modules.dm.service.repository.DmServicePjRepository;
 import me.zhengjie.modules.dm.service.service.DmServicePjService;
 import me.zhengjie.modules.dmApp.domain.AppFoodPj;
 import me.zhengjie.modules.dmApp.service.AppFoodPjService;
@@ -39,6 +40,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,6 +58,7 @@ public class OpenApiController {
     private final DmOrderRecordRepository dmOrderRecordRepository;
     private final DmOrderItemRepository orderItemRepository;
     private final DmFoodCateRepository dmFoodCateRepository;
+    private final DmServicePjRepository dmServicePjRepository;
 
     @Log("获取今日菜品-App")
     @ApiOperation("获取今日菜品-App")
@@ -161,4 +164,62 @@ public class OpenApiController {
         SecurityUtils.CheckApiAuth(criteria);
         return new BaseResponse<>(dmServicePjService.getDmServicePjByUserCodeAndPjTime(criteria.getQuery().getUserCode()));
     }
+
+    @AnonymousPostMapping(value = "/AppCountData")
+    @Log("统计数据")
+    @ApiOperation("App端统计数据")
+    public BaseResponse<Object> appCountData(@RequestBody QueryPageParams<String> criteria){
+        SecurityUtils.CheckApiAuth(criteria);
+
+        /**
+         * 查询今日购餐总额(元)
+         */
+        BigDecimal bigDecimal =  dmOrderRecordRepository.countOrderAmtByNow();
+        /**
+         * 查询今日用餐人数(人次)
+         */
+        Integer person = dmOrderRecordRepository.countOrderPersonByNow();
+        /**
+         * 查询服务评价
+         */
+         List<DmServicePj> dmServicePjContentByNow = dmServicePjRepository.getDmServicePjContentByNow();
+        /**
+         * 统计综合服务评分
+         */
+        Map<String, Object> dmServicePjByNow = dmServicePjRepository.getDmServicePjByNow();
+        dmServicePjByNow.put("dmServicePjContentByNow",dmServicePjContentByNow);
+        dmServicePjByNow.put("person",person);
+        dmServicePjByNow.put("money",bigDecimal.toString());
+        return new BaseResponse<>(dmServicePjByNow);
+    }
+
+    @AnonymousPostMapping(value = "/AppDayFoodData")
+    @Log("今日菜品清单")
+    @ApiOperation("App今日菜品清单")
+    public BaseResponse<Object> AppDayFoodData(@RequestBody QueryPageParams<String> criteria){
+        SecurityUtils.CheckApiAuth(criteria);
+
+        /**
+         * 查询今日菜品清单
+         * data { 菜品名称,菜品单价,供应数量 }
+         */
+         List<Map<String, Object>> maps = dmFoodCateRepository.foodApp();
+
+        /**
+         * 声明一个json对象用来存储菜品统计信息
+         */
+        JSONObject jsonObject = new JSONObject();
+
+        /**
+         * 使用forEach之后 里面的变量必须要用原子类
+         */
+        maps.forEach(item->{
+//            item.get("")
+
+         });
+
+        return new BaseResponse<>(maps);
+    }
+
+
 }