Merge branch 'feature/2025-10-23' into 'master'

Feature/2025 10 23



See merge request !4

@@ -181,4 +181,9 @@ public class OrderDb extends Model<OrderDb> implements Serializable {
      * 是否撤销订单
      * 是否撤销订单
      */
      */
     private Boolean isCanceled;
     private Boolean isCanceled;
+
+    /**
+     * 忌口备注
+     */
+    private String avoidRemark;
 }
 }
\ No newline at end of file

@@ -299,9 +299,6 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
             LambdaQueryWrapper<OrderDb> queryWrapper = Wrappers.lambdaQuery();
             LambdaQueryWrapper<OrderDb> queryWrapper = Wrappers.lambdaQuery();
 
 
             queryWrapper.eq(OrderDb::getEnterpriseId, request.getEnterpriseId());
             queryWrapper.eq(OrderDb::getEnterpriseId, request.getEnterpriseId());
-            if (request.getShouldFilterClientIds()) {
-                queryWrapper.in(OrderDb::getId, request.getClientIdsList());
-            }
 
 
             if (request.getShouldFilterOrderCode()) {
             if (request.getShouldFilterOrderCode()) {
                 queryWrapper.likeLeft(OrderDb::getOrderCode, request.getOrderCode());
                 queryWrapper.likeLeft(OrderDb::getOrderCode, request.getOrderCode());

@@ -416,6 +416,9 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
         if (updateOrderRequest.getModification().getShouldUpdateIsCanceled()) {
         if (updateOrderRequest.getModification().getShouldUpdateIsCanceled()) {
             orderDb.setIsCanceled(updateOrderRequest.getModification().getIsCanceled());
             orderDb.setIsCanceled(updateOrderRequest.getModification().getIsCanceled());
         }
         }
+        if (updateOrderRequest.getModification().getShouldUpdateAvoidRemark()) {
+            orderDb.setAvoidRemark(updateOrderRequest.getModification().getAvoidRemark());
+        }
         return orderDbMapper.updateById(orderDb) > 0;
         return orderDbMapper.updateById(orderDb) > 0;
     }
     }
 
 

@@ -140,6 +140,10 @@ public class DbToProtoUtil {
       protoBuilder.setPayTime((orderDb.getPayTime().toEpochSecond(ZoneOffset.UTC) * 1000));
       protoBuilder.setPayTime((orderDb.getPayTime().toEpochSecond(ZoneOffset.UTC) * 1000));
     }
     }
 
 
+    if (orderDb.getAvoidRemark() != null) {
+      protoBuilder.setAvoidRemark(orderDb.getAvoidRemark());
+    }
+
     // 处理嵌套的CustomerNotice字段
     // 处理嵌套的CustomerNotice字段
     if (orderDb.getCustomerNoticeJson()!= null) {
     if (orderDb.getCustomerNoticeJson()!= null) {
 //      Constructor<CustomerNotice> customerNoticeConstructor =
 //      Constructor<CustomerNotice> customerNoticeConstructor =

@@ -89,6 +89,11 @@ enum OnlinePayEnum {
   LEAVE_HOSPITAL = 3;//出院
   LEAVE_HOSPITAL = 3;//出院
   EMPLOYEE_CARD = 4; //员工卡
   EMPLOYEE_CARD = 4; //员工卡
   PAPER_VERIFICATION = 5; //纸质核销
   PAPER_VERIFICATION = 5; //纸质核销
+  CASH = 6;//现金
+  MEAL_CARD = 7;//餐卡
+  BAND_CARD = 8;//银行卡
+  ALIPAY = 9;//支付宝
+  WECHATPAY = 10;//微信支付
 }
 }
 
 
 enum ServeStatusEnum {
 enum ServeStatusEnum {
@@ -141,6 +146,7 @@ message SingleClientCustomerOrderRpcResponse {
   bool isAllocation = 35;
   bool isAllocation = 35;
   string syncRoomNo = 36;
   string syncRoomNo = 36;
   bool isCanceled = 37;
   bool isCanceled = 37;
+  string avoidRemark = 38;
 }
 }
 
 
 message GetClientCustomerOrderByIdRpcRequest {
 message GetClientCustomerOrderByIdRpcRequest {
@@ -385,6 +391,8 @@ message ClientCustomerOrderModification {
   string syncRoomNo = 55;
   string syncRoomNo = 55;
   bool shouldUpdateIsCanceled = 56;
   bool shouldUpdateIsCanceled = 56;
   bool isCanceled = 57;
   bool isCanceled = 57;
+  bool shouldUpdateAvoidRemark = 58;
+  string avoidRemark = 59;
 }
 }
 
 
 message UpdateClientCustomerOrderRpcRequest {
 message UpdateClientCustomerOrderRpcRequest {