Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java

@@ -12,29 +12,25 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class DeviceServiceImpl implements DeviceService {
+    @Autowired
+    private DeviceMapper mapper;
+
+
+    @Value("${face.android.appId}")
+    private String appId;
+    @Value("${face.android.sdkKey}")
+    private String appKey;
+
     @Override
     public AjaxResult getDeviceInfo(AppDTO dto) {
-        return null;
+        //判断设备是否存在
+        DeviceInfoVo deviceInfoVo = mapper.getDeviceInfo(dto);
+        if (deviceInfoVo == null) {
+            return AjaxResult.error("设备不存在");
+        }
+        deviceInfoVo.setAppId(appId);
+        deviceInfoVo.setAppKey(appKey);
+        deviceInfoVo.setTenantId(String.valueOf(GlobalConstants.TENANT_ID));
+        return AjaxResult.success(deviceInfoVo);
     }
-//    @Autowired
-//    private DeviceMapper mapper;
-//
-//
-//    @Value("${face.android.appId}")
-//    private String appId;
-//    @Value("${face.android.sdkKey}")
-//    private String appKey;
-//
-//    @Override
-//    public AjaxResult getDeviceInfo(AppDTO dto) {
-//        //判断设备是否存在
-//        DeviceInfoVo deviceInfoVo = mapper.getDeviceInfo(dto);
-//        if (deviceInfoVo == null){
-//            return AjaxResult.error("设备不存在");
-//        }
-//        deviceInfoVo.setAppId(appId);
-//        deviceInfoVo.setAppKey(appKey);
-//        deviceInfoVo.setTenantId(String.valueOf(GlobalConstants.TENANT_ID));
-//        return AjaxResult.success(deviceInfoVo);
-//    }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuEvaluaOrderController.java

@@ -2,6 +2,8 @@ package com.bonus.canteen.core.menu.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.bonus.canteen.core.menu.dto.MenuEvaluaOrderAddDTO;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.canteen.core.common.annotation.PreventRepeatSubmit;
 import io.swagger.annotations.Api;
@@ -81,7 +83,7 @@ public class MenuEvaluaOrderController extends BaseController {
     //@RequiresPermissions("menu:order:add")
     @SysLog(title = "订单评价", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增订单评价")
     @PostMapping
-    public AjaxResult add(@RequestBody MenuEvaluaOrder menuEvaluaOrder) {
+    public AjaxResult add(@RequestBody MenuEvaluaOrderAddDTO menuEvaluaOrder) {
         try {
             return toAjax(menuEvaluaOrderService.insertMenuEvaluaOrder(menuEvaluaOrder));
         } catch (Exception e) {

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuEvaluaOrderAddDTO.java

@@ -0,0 +1,89 @@
+package com.bonus.canteen.core.menu.dto;
+
+import com.bonus.canteen.core.menu.domain.MenuEvaluaDetail;
+import com.bonus.common.core.annotation.Excel;
+import com.bonus.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 订单评价对象 menu_evalua_order
+ * 
+ * @author xsheng
+ * @date 2025-04-20
+ */
+
+
+@Data
+@ToString
+public class MenuEvaluaOrderAddDTO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 评价id */
+    @Excel(name = "评价id")
+    @ApiModelProperty(value = "评价id")
+    private Long evaluaId;
+
+    /** 订单编号 */
+    @Excel(name = "订单编号")
+    @ApiModelProperty(value = "订单编号")
+    private Long ordId;
+
+    /** 星级 */
+    @Excel(name = "星级")
+    @ApiModelProperty(value = "星级")
+    private Long starLevel;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    /** 描述回复 */
+    @Excel(name = "描述回复")
+    @ApiModelProperty(value = "描述回复")
+    private String reply;
+
+    /** 描述回复时间 */
+    @ApiModelProperty(value = "描述回复时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "描述回复时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date replyTime;
+
+    /** 档口或店铺id */
+    @Excel(name = "档口或店铺id")
+    @ApiModelProperty(value = "档口或店铺id")
+    private Long shopstallId;
+
+    /** 展示状态(1-展示,2-不展示) */
+    @Excel(name = "展示状态(1-展示,2-不展示)")
+    @ApiModelProperty(value = "展示状态(1-展示,2-不展示)")
+    private Long showFlag;
+
+    /** 删除标识(0-正常,2-删除) */
+    private Long delFlag;
+
+    /** 乐观锁 */
+    @Excel(name = "乐观锁")
+    @ApiModelProperty(value = "乐观锁")
+    private Long revision;
+
+    /** 订单评价类型1食堂2商超 */
+    @Excel(name = "订单评价类型1食堂2商超")
+    @ApiModelProperty(value = "订单评价类型1食堂2商超")
+    private Long orderEvaluaType;
+
+    @ApiModelProperty("评价图片")
+    private List<String> pictureList;
+
+    @ApiModelProperty("订单详情")
+    List<MenuEvaluaDetail> detailList;
+}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuEvaluaOrderMapper.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.menu.mapper;
 
 import java.util.List;
 import com.bonus.canteen.core.menu.domain.MenuEvaluaOrder;
+import com.bonus.canteen.core.menu.dto.MenuEvaluaOrderAddDTO;
 
 /**
  * 订单评价Mapper接口
@@ -32,7 +33,7 @@ public interface MenuEvaluaOrderMapper {
      * @param menuEvaluaOrder 订单评价
      * @return 结果
      */
-    public int insertMenuEvaluaOrder(MenuEvaluaOrder menuEvaluaOrder);
+    public int insertMenuEvaluaOrder(MenuEvaluaOrderAddDTO menuEvaluaOrder);
 
     /**
      * 修改订单评价

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuEvaluaOrderService.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.menu.service;
 
 import java.util.List;
 import com.bonus.canteen.core.menu.domain.MenuEvaluaOrder;
+import com.bonus.canteen.core.menu.dto.MenuEvaluaOrderAddDTO;
 
 /**
  * 订单评价Service接口
@@ -32,7 +33,7 @@ public interface IMenuEvaluaOrderService {
      * @param menuEvaluaOrder 订单评价
      * @return 结果
      */
-    public int insertMenuEvaluaOrder(MenuEvaluaOrder menuEvaluaOrder);
+    public int insertMenuEvaluaOrder(MenuEvaluaOrderAddDTO menuEvaluaOrder);
 
     /**
      * 修改订单评价

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuEvaluaOrderServiceImpl.java

@@ -1,6 +1,8 @@
 package com.bonus.canteen.core.menu.service.impl;
 
 import java.util.List;
+
+import com.bonus.canteen.core.menu.dto.MenuEvaluaOrderAddDTO;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +51,7 @@ public class MenuEvaluaOrderServiceImpl implements IMenuEvaluaOrderService {
      * @return 结果
      */
     @Override
-    public int insertMenuEvaluaOrder(MenuEvaluaOrder menuEvaluaOrder) {
+    public int insertMenuEvaluaOrder(MenuEvaluaOrderAddDTO menuEvaluaOrder) {
         menuEvaluaOrder.setCreateTime(DateUtils.getNowDate());
         try {
             return menuEvaluaOrderMapper.insertMenuEvaluaOrder(menuEvaluaOrder);

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaOrderMapper.xml

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertMenuEvaluaOrder" parameterType="com.bonus.canteen.core.menu.domain.MenuEvaluaOrder" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertMenuEvaluaOrder" parameterType="com.bonus.canteen.core.menu.dto.MenuEvaluaOrderAddDTO" useGeneratedKeys="true" keyProperty="id">
         insert into menu_evalua_order
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="evaluaId != null">evalua_id,</if>