bug修复

cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java

@@ -99,7 +99,7 @@ public class MyStpLogic {
      * @param loginType 登录类型枚举
      * @param isAdmin   是否为管理员账号
      */
-    public void login(Long id, String account, Long shopId, Long headShopId, String shopName, LoginType loginType, boolean isAdmin, String platForm) {
+    public void login(Long id, String account, Long shopId, Long headShopId, String shopName, LoginType loginType, boolean isAdmin, String platForm, boolean isMainShop) {
         StpLogic logic = getLogic();
         logic.login(id);
         if (loginType.equals(LoginType.MANAGER) && shopId == null) {
@@ -117,6 +117,13 @@ public class MyStpLogic {
         if (shopName != null) {
             session.set("shopName", shopName);
         }
+
+        session.set("isMainShop", isMainShop);
+    }
+
+    public boolean isMainShop() {
+        StpLogic logic = getLogic();
+        return (Boolean) logic.getSession().get("isMainShop");
     }
 
     public String getPlatForm() {

cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java

@@ -12,6 +12,7 @@ import java.io.Serial;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;
+import lombok.experimental.Accessors;
 
 /**
  * 支付详情 实体类。
@@ -21,6 +22,7 @@ import lombok.*;
  */
 @Data
 @Table("tb_order_payment")
+@Accessors(chain = true)
 public class OrderPayment implements Serializable {
 
     @Serial
@@ -32,13 +34,22 @@ public class OrderPayment implements Serializable {
     @Id(keyType = KeyType.Auto)
     private Long id;
 
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     /**
      * 店铺Id
      */
     private Long shopId;
 
     /**
-     * 来源Id 订单Id或充值id 
+     * 来源Id 订单Id或充值id
      */
     private Long sourceId;
     /**