迁移is_show

deploy.sh

@@ -2,7 +2,7 @@
 
 # 设置远程服务器信息
 REMOTE_USER="root"  # 远程服务器用户名，根据你的实际情况修改
-REMOTE_HOST="111.230.193.88" # 远程服务器地址
+REMOTE_HOST="116.204.43.56" # 远程服务器地址
 REMOTE_BASE_DIR="/home/software"  # 远程服务器上的部署目录，根据你的目录结构修改
 
 # 本地 JAR 包路径  -- 根据你提供的目录结构修改

fs-admin/src/main/resources/application-dev.yml

@@ -29,9 +29,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://gz-cdb-of55khc9.sql.tencentcdb.com:23620/fs_hospital?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://55df955d464b4801af6c6df09196bb47in01.internal.cn-north-9.mysql.rds.myhuaweicloud.com:3306/fs_hospital?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Rtyy_2023
+                password: RXZ5&Z3CyNBf+AV
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

fs-api/src/main/resources/application-dev.yml

@@ -27,9 +27,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/fs_hospital?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://gz-cdb-of55khc9.sql.tencentcdb.com:23620/fs_hospital?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 123456
+                password: Rtyy_2023
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

fs-company/src/main/resources/application-dev.yml

@@ -40,9 +40,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://gz-cdb-of55khc9.sql.tencentcdb.com:23620/fs_hospital?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://55df955d464b4801af6c6df09196bb47in01.internal.cn-north-9.mysql.rds.myhuaweicloud.com:3306/fs_hospital?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Rtyy_2023
+                password: RXZ5&Z3CyNBf+AV
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

fs-service-system/src/main/java/com/fs/store/domain/FsUser.java

@@ -124,6 +124,16 @@ public class FsUser extends BaseEntity
 
     private String userCode;
 
+    private Integer isShow;//是否展示购买以及订单状态
+
+    public Integer getIsShow() {
+        return isShow;
+    }
+
+    public void setIsShow(Integer isShow) {
+        this.isShow = isShow;
+    }
+
     public String getUserCode() {
         return userCode;
     }

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java

@@ -1100,4 +1100,7 @@ public interface FsStoreOrderMapper
     List<FsStoreOrder> selectDeliverPendingData();
 
     List<FsStoreOrder> selectFsOutDateOrder();
+
+    @Select("select * from fs_store_order where user_id = #{userId} limit 1")
+    FsStoreOrder selectOrderByUserIdLimit1(Long userId);
 }

fs-service-system/src/main/java/com/fs/store/service/IFsStoreOrderService.java

@@ -297,4 +297,6 @@ public interface IFsStoreOrderService
      */
     List<FsStoreOrder> selectDeliverPenddingData();
 
+    FsStoreOrder selectOrderByUserIdLimit1(Long userId);
+
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -1777,6 +1777,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         return fsStoreOrderMapper.selectDeliverPendingData();
     }
 
+    @Override
+    public FsStoreOrder selectOrderByUserIdLimit1(Long userId) {
+        return fsStoreOrderMapper.selectOrderByUserIdLimit1(userId);
+    }
+
     @Override
     @Transactional(rollbackFor = Throwable.class,propagation = Propagation.REQUIRED)
     //类型1支付回调 类型2货到付款

fs-user-app/src/main/java/com/fs/app/controller/UserController.java

@@ -9,6 +9,7 @@ import com.fs.common.config.FSConfig;
 import com.fs.common.core.domain.R;
 import com.fs.common.param.BaseQueryParam;
 import com.fs.common.utils.OrderUtils;
+import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.domain.FsUser;
 import com.fs.store.domain.FsUserBill;
 import com.fs.store.domain.FsUserPromoterApply;
@@ -64,6 +65,12 @@ public class UserController extends  AppBaseController {
     public R getUserInfo(){
         try {
             FsUser user=userService.selectFsUserById(Long.parseLong(getUserId()));
+            if (user.getIsShow()==0){
+                FsStoreOrder order = orderService.selectOrderByUserIdLimit1(user.getUserId());
+                if (order!=null){
+                    user.setIsShow(1);
+                }
+            }
             return R.ok().put("user",user);
         } catch (Exception e){
 

fs-user-app/src/main/resources/application-dev.yml

@@ -27,9 +27,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://gz-cdb-of55khc9.sql.tencentcdb.com:23620/fs_hospital?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://55df955d464b4801af6c6df09196bb47in01.internal.cn-north-9.mysql.rds.myhuaweicloud.com:3306/fs_hospital?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Rtyy_2023
+                password: RXZ5&Z3CyNBf+AV
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭