bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug 6334

This commit is contained in:
sxu 2025-06-17 13:13:41 +08:00
parent a6422e9aa9
commit 05dc6fa2ce
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaDetail.java
View File

@ -34,11 +34,14 @@ public class CookEvaluaDetail extends BaseEntity {
@ApiModelProperty(value = "餐品类型(1-菜品,2-套餐,3-商品)") @ApiModelProperty(value = "餐品类型(1-菜品,2-套餐,3-商品)")
private Long mealType; private Long mealType;
/** 餐品id */ /** 菜品id */
@Excel(name = "餐品id") @Excel(name = "菜品id")
@ApiModelProperty(value = "餐品id") @ApiModelProperty(value = "菜品id")
private Long mealId; private Long mealId;
@ApiModelProperty(value = "菜品名称")
private String dishesName;
/** 星级 */ /** 星级 */
@Excel(name = "星级") @Excel(name = "星级")
@ApiModelProperty(value = "星级") @ApiModelProperty(value = "星级")

27
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaOrderServiceImpl.java
View File

@ -113,16 +113,14 @@ public class CookEvaluaOrderServiceImpl implements ICookEvaluaOrderService {
cookEvaluaOrderDTO.setUserId(SecurityUtils.getUserId()); cookEvaluaOrderDTO.setUserId(SecurityUtils.getUserId());
} }
try { try {
int count = cookEvaluaOrderMapper.insertCookEvaluaOrder(cookEvaluaOrderDTO); CookEvaluaOrder evaluaOrder = cookEvaluaOrderMapper.selectCookEvaluaOrderByOrderId(cookEvaluaOrderDTO.getOrderId());
long evaluaId = cookEvaluaOrderDTO.getEvaluaId(); int count = 0;
List<String> pictureList = cookEvaluaOrderDTO.getPictureList(); long evaluaId = 0;
for (int i = 0; i < pictureList.size(); i++) { if (Objects.isNull(evaluaOrder)) {
CookEvaluaPicture cookEvaluaPicture = new CookEvaluaPicture(); count = cookEvaluaOrderMapper.insertCookEvaluaOrder(cookEvaluaOrderDTO);
cookEvaluaPicture.setEvaluaId(evaluaId); evaluaId = cookEvaluaOrderDTO.getEvaluaId();
cookEvaluaPicture.setImgUrl(pictureList.get(i)); } else {
cookEvaluaPicture.setCreateTime(DateUtils.getNowDate()); evaluaId = evaluaOrder.getEvaluaId();
cookEvaluaPicture.setCreateBy(SecurityUtils.getUsername());
cookEvaluaPictureMapper.insertCookEvaluaPicture(cookEvaluaPicture);
} }
List<CookEvaluaDetail> detailList = cookEvaluaOrderDTO.getDetailList(); List<CookEvaluaDetail> detailList = cookEvaluaOrderDTO.getDetailList();
for (int i = 0; i < detailList.size(); i++) { for (int i = 0; i < detailList.size(); i++) {
@ -132,6 +130,15 @@ public class CookEvaluaOrderServiceImpl implements ICookEvaluaOrderService {
cookEvaluaDetail.setCreateBy(SecurityUtils.getUsername()); cookEvaluaDetail.setCreateBy(SecurityUtils.getUsername());
cookEvaluaDetailMapper.insertCookEvaluaDetail(cookEvaluaDetail); cookEvaluaDetailMapper.insertCookEvaluaDetail(cookEvaluaDetail);
} }
List<String> pictureList = cookEvaluaOrderDTO.getPictureList();
for (int i = 0; i < pictureList.size(); i++) {
CookEvaluaPicture cookEvaluaPicture = new CookEvaluaPicture();
cookEvaluaPicture.setEvaluaId(evaluaId);
cookEvaluaPicture.setImgUrl(pictureList.get(i));
cookEvaluaPicture.setCreateTime(DateUtils.getNowDate());
cookEvaluaPicture.setCreateBy(SecurityUtils.getUsername());
cookEvaluaPictureMapper.insertCookEvaluaPicture(cookEvaluaPicture);
}
cookEvaluaOrderMapper.updateOrderEvaluaStatus(cookEvaluaOrderDTO.getOrderId()); cookEvaluaOrderMapper.updateOrderEvaluaStatus(cookEvaluaOrderDTO.getOrderId());
return count; return count;
} catch (Exception e) { } catch (Exception e) {

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaDetailMapper.xml
View File

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="evaluaId" column="evalua_id" /> <result property="evaluaId" column="evalua_id" />
<result property="mealType" column="meal_type" /> <result property="mealType" column="meal_type" />
<result property="mealId" column="meal_id" /> <result property="mealId" column="meal_id" />
<result property="dishesName" column="dishes_name" />
<result property="starLevel" column="star_level" /> <result property="starLevel" column="star_level" />
<result property="description" column="description" /> <result property="description" column="description" />
<result property="evaluaNickName" column="nick_name" /> <result property="evaluaNickName" column="nick_name" />
@ -20,8 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectCookEvaluaDetailVo"> <sql id="selectCookEvaluaDetailVo">
select ced.evalua_detail_id, ced.evalua_id, ced.meal_type, ced.meal_id, ced.star_level, select ced.evalua_detail_id, ced.evalua_id, ced.meal_type, ced.meal_id, ced.star_level,
ced.description, ced.create_by, ced.create_time, ced.update_by, ced.update_time, ced.description, ced.create_by, ced.create_time, ced.update_by, ced.update_time,
su.nick_name su.nick_name, cd.dishes_name
from cook_evalua_detail ced from cook_evalua_detail ced
left join cook_dishes cd on cd.dishes_id = ced.meal_id
left join cook_evalua_order ceo on ceo.evalua_id = ced.evalua_id left join cook_evalua_order ceo on ceo.evalua_id = ced.evalua_id
left join sys_user su on su.user_id = ceo.user_id left join sys_user su on su.user_id = ceo.user_id
</sql> </sql>