czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-3.0.0' into dev

Browse Source
This commit is contained in:
张松
2024-12-17 13:34:09 +08:00
parent a3d6cc105a 6e7fcd6404
commit 96247fab7d
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -643,8 +643,12 @@ public class OrderService {
if (StringUtils.isEmpty(shopId)) {
return Result.fail(CodeEnum.SHOPINFONOEXIST);
}
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(Integer.valueOf(shopId), tableId);
ShopEatTypeInfoDTO shopEatTypeInfoDTO;
if (StrUtil.isBlank(tableId)) {
shopEatTypeInfoDTO = getEatModelUnCheck(Integer.valueOf(shopId), tableId);
}else {
shopEatTypeInfoDTO = checkEatModel(Integer.valueOf(shopId), tableId);
}
String day = DateUtils.getDay();
String finalMasterId1 = masterId;

5
src/main/resources/mapper/TbProductMapper.xml
View File

@@ -486,6 +486,7 @@
<if test="commdityName != null and commdityName!='' ">
and a.name like CONCAT('%',#{commdityName},'%')
</if>
and type != 'coupon'
and b.is_grounding=1 GROUP BY a.id ORDER BY a.`sort`
@@ -512,6 +513,8 @@
<if test="commdityName != null and commdityName!='' ">
and a.name like CONCAT('%',#{commdityName},'%')
</if>
and type != 'coupon'
and b.is_grounding=1 GROUP BY a.id ORDER BY a.`sort`
</select>
@@ -524,6 +527,8 @@
<if test="commdityName != null and commdityName!='' ">
and a.name like CONCAT('%',#{commdityName},'%')
</if>
and type != 'coupon'
and b.is_grounding=0 GROUP BY a.id ORDER BY a.`sort`
</select>