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

Merge remote-tracking branch 'origin/test' into test

Browse Source 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
This commit is contained in:
Tankaikai
2024-09-26 17:28:46 +08:00
parent a4c45c0ef8 3bbd6a254d
commit 3026609afb
7 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java
View File

@@ -2,6 +2,7 @@ package com.chaozhanggui.system.cashierservice.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.chaozhanggui.system.cashierservice.entity.dto.ChoseCountDTO;
import com.chaozhanggui.system.cashierservice.entity.dto.ChoseEatModelDTO;
@@ -41,9 +42,13 @@ public class ProductController {
@RequestHeader("id") String userId,
@RequestParam(required = false) String lat,
@RequestParam(required = false) String lng,
@RequestParam("code") String code
@RequestParam(required = false) String code,
@RequestParam(required = false) Integer shopId
) {
return productService.queryShopIdByTableCode(userId, openId, code,lat,lng);
if (shopId == null && StrUtil.isBlank(code)) {
return Result.fail("参数缺失");
}
return productService.queryShopIdByTableCode(userId, openId, code,lat,lng, shopId);
}
/**