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

调整订单逻辑，增加店内外带用餐方式，增加多次下单标记

Browse Source
This commit is contained in:
SongZhang
2024-09-24 09:55:21 +08:00
parent 7adf50ab99
commit ca49d31260
24 changed files with 1069 additions and 1798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
View File

@@ -3,12 +3,12 @@ package com.chaozhanggui.system.cashierservice.controller;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.chaozhanggui.system.cashierservice.annotation.MyLog;
import com.chaozhanggui.system.cashierservice.bean.LogTag;
import com.chaozhanggui.system.cashierservice.entity.OrderVo;
import com.chaozhanggui.system.cashierservice.entity.dto.ChoseCountDTO;
import com.chaozhanggui.system.cashierservice.entity.dto.UpdateVipDTO;
import com.chaozhanggui.system.cashierservice.entity.vo.CartVo;
import com.chaozhanggui.system.cashierservice.service.OrderService;
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.TokenUtil;
import lombok.extern.slf4j.Slf4j;
@@ -28,7 +28,6 @@ public class OrderController {
private OrderService orderService;
@PutMapping("/updateVip")
@MyLog(value = "代客下单 修改会员", tag = LogTag.PLACE)
public ResponseEntity<Object> updateVip(
@Validated @RequestBody UpdateVipDTO updateVipDTO
) {
@@ -39,100 +38,106 @@ public class OrderController {
public Result createCart(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@RequestBody CartVo cartVo
){
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
@Validated @RequestBody CartVo cartVo
) {
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId");
return orderService.createCart(cartVo.getMasterId(),cartVo.getProductId(),cartVo.getShopId(),
cartVo.getSkuId(),cartVo.getNumber(),userId,clientType,cartVo.getCartId(),cartVo.getIsGift(),
cartVo.getIsPack(),cartVo.getUuid(),cartVo.getType(), cartVo.getTableId());
return orderService.createCart(cartVo.getMasterId(), cartVo.getProductId(), cartVo.getShopId(),
cartVo.getSkuId(), cartVo.getNumber(), userId, clientType, cartVo.getCartId(), cartVo.getIsGift(),
cartVo.getIsPack(), cartVo.getUuid(), cartVo.getType(), cartVo.getTableId());
}
@MyLog(value = "查询购物车信息", tag = LogTag.CART)
@GetMapping("/queryCart")
public Result queryCart(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@RequestParam(value = "masterId", required = false) String masterId,
@RequestParam(required = false) String tableId,
@RequestParam("shopId") String shopId
){
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@RequestParam(value = "masterId", required = false) String masterId,
@RequestParam(required = false) String tableId,
@RequestParam("shopId") String shopId
) {
if (tableId == null && StrUtil.isBlank(masterId)) {
return Result.fail("masterId和tableId不能同时为空");
}
return orderService.queryCart(masterId,shopId, tableId);
return orderService.queryCart(masterId, shopId, tableId);
}
@GetMapping("/delCart")
public Result delCart(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@RequestParam(required = false) String tableId,
@RequestParam(value = "masterId", required = false) String masterId,
@RequestParam("cartId") Integer cartId
){
return orderService.delCart(masterId,cartId);
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@RequestParam(required = false) String tableId,
@RequestParam(value = "masterId", required = false) String masterId,
@RequestParam("cartId") Integer cartId
) {
return orderService.delCart(masterId, cartId);
}
@GetMapping("/createCode")
public Result createCode(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@RequestParam("shopId") String shopId,
@RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,
@RequestParam("shopId") String shopId,
@RequestParam(required = false) String tableId,
String type
){
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId");
return orderService.createCode(shopId,clientType,userId,type, tableId);
}
@GetMapping("/getCartList")
public Result getCart(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestParam("shopId") Integer shopId){
return orderService.getCartList(shopId);
}
@GetMapping("/getCartPrductSpec")
public Result getCartPrductSpec(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestParam("cartId") Integer cartId){
return orderService.getCartPrductSpec(cartId);
}
@PostMapping("/cartStatus")
public Result cartStatus(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestBody CartVo cartVo){
) {
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId");
String code = jsonObject.getString("code");
return orderService.cartStatus(Integer.valueOf(cartVo.getShopId()),cartVo.getMasterId(),
cartVo.getStatus(),userId,cartVo.getUuid(),clientType, cartVo.getVipUserId(), cartVo.getTableId());
return orderService.createCode(shopId, clientType, userId, type, tableId);
}
@GetMapping("/getCartList")
public Result getCart(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestParam("shopId") Integer shopId) {
return orderService.getCartList(shopId);
}
@GetMapping("/getCartPrductSpec")
public Result getCartPrductSpec(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestParam("cartId") Integer cartId) {
return orderService.getCartPrductSpec(cartId);
}
@PostMapping("/cartStatus")
public Result cartStatus(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestBody CartVo cartVo) {
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId");
return orderService.cartStatus(cartVo.getShopId(), cartVo.getMasterId(),
cartVo.getStatus(), userId, cartVo.getUuid(), clientType, cartVo.getTableId(), token, cartVo.getOrderId());
}
@PostMapping("/createOrder")
public Result createOrder(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestBody OrderVo orderVo){
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
@RequestHeader("clientType") String clientType, @RequestBody OrderVo orderVo) {
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId");
orderVo.setMerchantId(Integer.valueOf(userId));
orderVo.setUserId(jsonObject.getString("staffId"));
return orderService.createOrder(orderVo,clientType,token, null, orderVo.getType() != null && orderVo.getType().equals(0));
return orderService.createOrder(orderVo, clientType, token, null);
}
@PostMapping("/createBackOrder")
public Result createBackOrder(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestBody OrderVo orderVo){
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
@RequestHeader("clientType") String clientType, @RequestBody OrderVo orderVo) {
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId");
orderVo.setMerchantId(Integer.valueOf(userId));
orderVo.setUserId(jsonObject.getString("staffId"));
return orderService.createBackOrder(orderVo,clientType,token);
return orderService.createBackOrder(orderVo, clientType, token);
}
@PostMapping("/packall")
public Result packall(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestBody CartVo cartVo){
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
@RequestHeader("clientType") String clientType, @RequestBody CartVo cartVo) {
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId");
return orderService.packall(cartVo);
}
@PostMapping("/clearCart")
public Result clearCart(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestBody CartVo cartVo){
@RequestHeader("clientType") String clientType, @RequestBody CartVo cartVo) {
return orderService.clearCart(cartVo);
}
@@ -144,45 +149,51 @@ public class OrderController {
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
@RequestParam(value = "size", required = false, defaultValue = "1") Integer size){
return orderService.findOrder(shopId,status,page,size,orderNo, DateUtil.parse(startTime), DateUtil.parse(endTime));
@RequestParam(value = "size", required = false, defaultValue = "1") Integer size) {
return orderService.findOrder(shopId, status, page, size, orderNo, DateUtil.parse(startTime), DateUtil.parse(endTime));
}
@GetMapping("/orderDetail")
public Result orderDetail(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestParam("shopId") Integer shopId,
@RequestParam("id") Integer id){
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
@RequestHeader("clientType") String clientType, @RequestParam("shopId") Integer shopId,
@RequestParam("id") Integer id) {
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId");
return orderService.orderDetail(shopId,id, clientType, token, userId, jsonObject.getString("staffId"));
return orderService.orderDetail(shopId, id, clientType, token, userId, jsonObject.getString("staffId"));
}
@RequestMapping(value = "sendMessage")
public Result sendMessage(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,@RequestParam("orderId") String orderId){
@RequestHeader("clientType") String clientType, @RequestParam("orderId") String orderId) {
return orderService.sendMassage(orderId);
}
@GetMapping(value = "scanSendMessage")
public Result scanSendMessage(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,@RequestParam("outNumber") String outNumber,@RequestParam("shopId") String shopId){
return orderService.scanSendMessage(outNumber,shopId);
@RequestHeader("clientType") String clientType, @RequestParam("outNumber") String outNumber, @RequestParam("shopId") String shopId) {
return orderService.scanSendMessage(outNumber, shopId);
}
@GetMapping(value = "getsendMessage")
public Result getsendMessage(@RequestHeader("token") String token, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType,@RequestParam("shopId") String shopId,@RequestParam("page") int page,
@RequestParam("pageSize") int pageSize){
return orderService.getOutNumber(shopId,page,pageSize);
@RequestHeader("clientType") String clientType, @RequestParam("shopId") String shopId, @RequestParam("page") int page,
@RequestParam("pageSize") int pageSize) {
return orderService.getOutNumber(shopId, page, pageSize);
}
@GetMapping("getOrderById")
public Result getOrderById(@RequestParam("orderId") Integer orderId){
return orderService.getOrder(orderId);
public Result getOrderById(@RequestParam("orderId") Integer orderId) {
return orderService.getOrder(orderId);
}
@PutMapping("/choseCount")
public Result choseCount(
@Validated @RequestBody ChoseCountDTO choseCountDTO
) {
return Result.success(CodeEnum.SUCCESS, orderService.choseCount(choseCountDTO));
}
}