feat:app流水通知显示备注

feat:咖啡机初步

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/api/feign/RemoteThirdKeyManageService.java

@@ -0,0 +1,26 @@
+package com.bsd.pjcloud.thirdparty.api.feign;
+
+import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.feign.annotation.NoToken;
+import com.bsd.pjcloud.thirdparty.entity.ThirdKeyManageEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 第三方密钥管理远程调用。密钥为平台级配置,跨租户按 bizType 全局取唯一记录
+ */
+@FeignClient(contextId = "remoteThirdKeyManageService", value = ServiceNameConstants.THIRDPARTY_SERVICE)
+public interface RemoteThirdKeyManageService {
+
+    /**
+     * 按 bizType 跨租户读取平台级密钥配置(咖啡机扫码支付场景匿名请求无租户头)
+     *
+     * @param bizType ThirdKeyTypeEnum 的 type 值
+     * @return 密钥配置;未配置时 data 为空
+     */
+    @NoToken
+    @GetMapping("/third-key-manage/inner/get-by-biz-type")
+    R<ThirdKeyManageEntity> getByBizType(@RequestParam("bizType") String bizType);
+}

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/constant/ThirdKeyTypeEnum.java

@@ -15,6 +15,10 @@ import java.util.Arrays;
 public enum ThirdKeyTypeEnum {
 
     LB("10", "宁波银行"),
+    /** 屋里咖啡咖啡机: 我方作为第三方支付服务商调厂商 getOrder/callback/refund 的鉴权对。 */
+    WULI_COFFEE("11", "屋里咖啡"),
+    /** 屋里咖啡咖啡机: 厂商调我方 queryOrder 查单的验签对(app_key=我方分配的appid)。 */
+    WULI_COFFEE_QUERY("12", "屋里咖啡查单"),
     ;
 
     private final String type;

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/appmessage/WalletMessageDetailDto.java

@@ -2,6 +2,7 @@ package com.bsd.pjcloud.thirdparty.dto.appmessage;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -31,6 +32,10 @@ public class WalletMessageDetailDto implements Serializable {
     @NotNull(message = "钱包结果余额不能为空")
     private Integer balance;
 
+    /** 流水备注快照，由后台操作人员补充业务说明；历史流水和未填写场景允许为空，最多256个字符。 */
+    @Size(max = 256, message = "流水备注不能超过256个字符")
+    private String remark;
+
     /** WalletBizEnum持久化编码，用于服务端再次校验聚合明细一致性。 */
     @NotBlank(message = "钱包业务类型不能为空")
     private String walletBizType;