czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Tankaikai
2025-03-17 13:49:08 +08:00
parent d4c329e7aa b2042e4721
commit c57a4ae545
11 changed files with 72 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java
View File

@@ -1,10 +1,7 @@
package com.czg.controller.admin;
import cn.hutool.core.util.StrUtil;
import com.czg.account.dto.shopuser.ShopUserAddDTO;
import com.czg.account.dto.shopuser.ShopUserEditDTO;
import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
import com.czg.account.dto.shopuser.ShopUserSummaryDTO;
import com.czg.account.dto.shopuser.*;
import com.czg.account.entity.ShopUser;
import com.czg.account.entity.ShopUserFlow;
import com.czg.account.service.ShopUserFlowService;
@@ -86,7 +83,7 @@ public class ShopUserController {
@SaStaffCheckPermission("yun_xu_guan_li_hui_yuan_xin_xi")
@SaAdminCheckPermission(value = "shopUser:list", name = "店铺用户列表")
@GetMapping
public CzgResult<Page<ShopUser>> list(String key, Integer isVip) {
public CzgResult<Page<ShopUserDTO>> list(String key, Integer isVip) {
return CzgResult.success(shopUserService.getPage(key, isVip));
}
@@ -103,7 +100,7 @@ public class ShopUserController {
if (id == null && userId == null) {
return CzgResult.failure("id和userId不能重复为空");
}
return CzgResult.success(shopUserService.getOne(new QueryWrapper().eq(ShopUser::getShopId, StpKit.USER.getShopId()).eq(ShopUser::getId, id).eq(ShopUser::getUserId, userId)));
return CzgResult.success(shopUserService.getDetail(id, userId));
}
/**

12
cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java
View File

@@ -54,8 +54,16 @@ public class PrintMqListener {
}
@RabbitListener(queues = {"${spring.profiles.active}-" + RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE})
public void orderPrint(String orderId) {
invokeFun("orderPrint", "java.order", orderId, (data) -> printerHandler.handler(data, PrinterHandler.PrintTypeEnum.ONE_AND_ORDER));
public void orderPrint(String req) {
invokeFun("orderPrint", "java.order", req, (data) -> {
JSONObject jsonObject = JSONObject.parseObject(data);
String orderId = jsonObject.getString("orderId");
if (orderId == null) {
throw new RuntimeException("订单打印失败，未传递orderId");
}
Boolean printOrder = jsonObject.getBoolean("printOrder");
printerHandler.handler(orderId, printOrder != null && !printOrder ? PrinterHandler.PrintTypeEnum.ORDER : PrinterHandler.PrintTypeEnum.ONE_AND_ORDER);
});
}
/**