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

用户进店信息记录

Browse Source 
团购卷卷码排序
团购卷支付
This commit is contained in:
wangw
2024-05-20 15:29:02 +08:00
parent 1aea7ba5ba
commit 1c3908a9ce
5 changed files with 71 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/controller/GroupOrderInfoController.java
View File

@@ -47,7 +47,7 @@ public class GroupOrderInfoController {
*/
@RequestMapping("getCoupon")
public Result queryCouponById(Integer id) {
return Result.success(CodeEnum.SUCCESS,orderCouponService.queryByOrderId(id));
return Result.success(CodeEnum.SUCCESS,orderCouponService.queryNoRefundByOrderId(id));
}
/**

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

@@ -2,8 +2,10 @@ package com.chaozhanggui.system.cashierservice.controller;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.chaozhanggui.system.cashierservice.service.ProductService;
import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.TokenUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,16 +25,21 @@ public class ProductController {
/**
* 通过桌码获取shopId
*
* @param code
* @return shopid
*/
@RequestMapping("queryShopIdByTableCode")
public Result queryShopIdByTableCode(@RequestParam("code") String code) {
return productService.queryShopIdByTableCode(code);
public Result queryShopIdByTableCode(@RequestHeader String token, @RequestParam("code") String code) {
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("userId");
String openId = jsonObject.getString("openId");
return productService.queryShopIdByTableCode(userId, openId, code);
}
/**
* 通过code和分组Id
*
* @param map
* @return
*/
@@ -66,7 +73,7 @@ public class ProductController {
@RequestParam String lat,
@RequestParam String lng,
@RequestHeader String environment) throws Exception {
return productService.productInfo(productId,lat,lng,environment);
return productService.productInfo(productId, lat, lng, environment);
}
/**
@@ -76,6 +83,6 @@ public class ProductController {
public Result orderConfirm(
@RequestParam Integer productId,
@RequestHeader String environment) throws Exception {
return productService.orderConfirm(productId,environment);
return productService.orderConfirm(productId, environment);
}
}