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

6
cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java
View File

@@ -1,5 +1,6 @@
package com.czg.config;
import com.alibaba.fastjson2.JSONObject;
import jakarta.annotation.Resource;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Value;
@@ -45,10 +46,11 @@ public class RabbitPublisher {
/**
* 订单打印消息
* @param orderId 订单id
* @param printOrder 是否打印结算单
*/
public void sendOrderPrintMsg(String orderId) {
public void sendOrderPrintMsg(String orderId, boolean printOrder) {
//厨房票
sendMsg(RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE, orderId);
sendMsg(RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE, new JSONObject().fluentPut("orderId", orderId).fluentPut("printOrder", printOrder).toString());
//前台票
sendMsg(RabbitConstants.Queue.ORDER_PRINT_QUEUE, orderId);
}

14
cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java Normal file
View File

@@ -0,0 +1,14 @@
package com.czg.account.dto.shopuser;
import com.czg.account.entity.ShopUser;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @author Administrator
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ShopUserDTO extends ShopUser {
private Long couponNum;
}

4
cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java
View File

@@ -14,7 +14,7 @@ import com.mybatisflex.core.service.IService;
*/
public interface ShopUserService extends IService<ShopUser> {
Page<ShopUser> getPage(String key, Integer isVip);
Page<ShopUserDTO> getPage(String key, Integer isVip);
Boolean updateInfo(Long shopId, ShopUserEditDTO shopUserEditDTO);
@@ -39,4 +39,6 @@ public interface ShopUserService extends IService<ShopUser> {
boolean join(Long shopId, Long userId, ShopUserAddDTO shopUserAddDTO);
ShopUserDetailDTO getInfo(Long shopId, long userId);
ShopUser getDetail(Integer id, Integer userId);
}