1、添加token验证

2、接口实现修改

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java

@@ -63,6 +63,13 @@ public interface CommonAPI {
      * */
     public HanHaiMember getUserByNameHanHaiAccount(String username);
 
+    /**
+     * 小程序验证 - 小程序openid验证
+     * @param username
+     * @return
+     * */
+    public HanHaiMember getUserByNameHanHaiXcxOpenId(String username);
+
 
 
     /**

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java

@@ -191,6 +191,37 @@ public class ShiroRealm extends AuthorizingRealm {
     }
 
 
+    /**
+     * 校验token的有效性
+     *
+     * @param token
+     */
+    public HanHaiMember checkUserTokenIsEffectHanHaiOpenId(String token) throws AuthenticationException {
+        Result result = new Result();
+        // 解密获得username，用于和数据库进行对比
+        String openid = JwtUtil.getUsername(token);
+        if (openid == null) {
+            throw new AuthenticationException("token非法无效!");
+        }
+
+        // 查询用户信息
+        log.debug("———校验token是否有效————checkUserTokenIsEffect——————— "+ token);
+        HanHaiMember user = commonApi.getUserByNameHanHaiXcxOpenId(openid);
+        if (user == null || user.getAppletOpenid() == null) {
+            throw new AuthenticationException("用户不存在!");
+        }
+//        // 判断用户状态
+//        if (user.getDeleteFlag().equals("Y")) {
+//            throw new AuthenticationException("账号已被注销,请联系管理员!");
+//        }
+        // 校验token是否超时失效 & 或者账号密码是否错误
+        if (!jwtTokenRefresh(token, openid, openid)) {
+            throw new JeecgBoot401Exception(CommonConstant.TOKEN_IS_INVALID_MSG);
+        }
+        return user;
+    }
+
+
 
     /**
      * JWTToken刷新生命周期 （实现： 用户在线操作不掉线功能）

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/controller/TravelAddressController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Api(tags="地址表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/entity/TravelAddress.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Data
@@ -63,11 +63,11 @@ public class TravelAddress implements Serializable {
 	@Excel(name = "详细地址 ", width = 15)
     @ApiModelProperty(value = "详细地址 ")
     private java.lang.String address;
-	/**所属用户*/
-	@Excel(name = "所属用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	/**关联用户id*/
+	@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-    @ApiModelProperty(value = "所属用户")
-    private java.lang.String memberId;
+    @ApiModelProperty(value = "关联用户id")
+    private java.lang.String userId;
 	/**是否为默认地址(0-否 1-是)*/
 	@Excel(name = "是否为默认地址(0-否 1-是)", width = 15)
     @ApiModelProperty(value = "是否为默认地址(0-否 1-是)")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/mapper/TravelAddressMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface TravelAddressMapper extends BaseMapper<TravelAddress> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/service/ITravelAddressService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface ITravelAddressService extends IService<TravelAddress> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/service/impl/TravelAddressServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 地址表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/TravelAddressList.vue

@@ -143,9 +143,9 @@
             dataIndex: 'address'
           },
           {
-            title:'所属用户',
+            title:'关联用户id',
             align:"center",
-            dataIndex: 'memberId_dictText'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'是否为默认地址(0-否 1-是)',
@@ -190,7 +190,7 @@
         fieldList.push({type:'string',value:'userPhone',text:'联系人电话',dictCode:''})
         fieldList.push({type:'string',value:'area',text:'所属区域',dictCode:''})
         fieldList.push({type:'string',value:'address',text:'详细地址 ',dictCode:''})
-        fieldList.push({type:'string',value:'memberId',text:'所属用户',dictCode:"han_hai_member,nick_name,id"})
+        fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         fieldList.push({type:'string',value:'addressDefault',text:'是否为默认地址(0-否 1-是)',dictCode:''})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/modules/TravelAddressForm.vue

@@ -24,8 +24,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="所属用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="memberId">
-              <j-dict-select-tag type="list" v-model="model.memberId" dictCode="han_hai_member,nick_name,id" placeholder="请选择所属用户" />
+            <a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue3/TravelAddress.data.ts

@@ -25,9 +25,9 @@ export const columns: BasicColumn[] = [
     dataIndex: 'address'
    },
    {
-    title: '所属用户',
+    title: '关联用户id',
     align:"center",
-    dataIndex: 'memberId_dictText'
+    dataIndex: 'userId_dictText'
    },
    {
     title: '是否为默认地址(0-否 1-是)',
@@ -61,8 +61,8 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '所属用户',
-    field: 'memberId',
+    label: '关联用户id',
+    field: 'userId',
     component: 'JDictSelectTag',
     componentProps:{
         dictCode:"han_hai_member,nick_name,id"

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/controller/TravelCollectionController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 收藏表
  * @Author: jeecg-boot
- * @Date:   2024-09-26
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Api(tags="收藏表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/entity/TravelCollection.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 收藏表
  * @Author: jeecg-boot
- * @Date:   2024-09-26
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Data
@@ -36,7 +36,6 @@ public class TravelCollection implements Serializable {
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
 	/**创建人*/
-	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建日期*/
@@ -56,4 +55,9 @@ public class TravelCollection implements Serializable {
 	@Excel(name = "项目所属id", width = 15)
     @ApiModelProperty(value = "项目所属id")
     private java.lang.String itemId;
+	/**关联用户id*/
+	@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "关联用户id")
+    private java.lang.String userId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/mapper/TravelCollectionMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 收藏表
  * @Author: jeecg-boot
- * @Date:   2024-09-26
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface TravelCollectionMapper extends BaseMapper<TravelCollection> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/ITravelCollectionService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 收藏表
  * @Author: jeecg-boot
- * @Date:   2024-09-26
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface ITravelCollectionService extends IService<TravelCollection> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/impl/TravelCollectionServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 收藏表
  * @Author: jeecg-boot
- * @Date:   2024-09-26
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/TravelCollectionList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import TravelCollectionModal from './modules/TravelCollectionModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'TravelCollectionList',
@@ -131,6 +132,11 @@
             align:"center",
             dataIndex: 'itemId'
           },
+          {
+            title:'关联用户id',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -167,6 +173,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'collectionType',text:'收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)',dictCode:''})
         fieldList.push({type:'string',value:'itemId',text:'项目所属id',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/modules/TravelCollectionForm.vue

@@ -13,6 +13,11 @@
               <a-input v-model="model.itemId" placeholder="请输入项目所属id"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue3/TravelCollection.data.ts

@@ -14,6 +14,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'itemId'
    },
+   {
+    title: '关联用户id',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -30,4 +35,12 @@ export const formSchema: FormSchema[] = [
     field: 'itemId',
     component: 'Input',
   },
+  {
+    label: '关联用户id',
+    field: 'userId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"han_hai_member,nick_name,id"
+     },
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/controller/TravelExperienceController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 非遗体验表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Api(tags="非遗体验表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/entity/TravelExperience.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 非遗体验表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Data
@@ -59,4 +59,16 @@ public class TravelExperience implements Serializable {
 	@Excel(name = "联系电话", width = 15)
     @ApiModelProperty(value = "联系电话")
     private java.lang.String phone;
+	/**经度*/
+	@Excel(name = "经度", width = 15)
+    @ApiModelProperty(value = "经度")
+    private java.math.BigDecimal experienceLongitude;
+	/**纬度*/
+	@Excel(name = "纬度", width = 15)
+    @ApiModelProperty(value = "纬度")
+    private java.math.BigDecimal experienceLatitude;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private java.math.BigDecimal experiencePrice;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/mapper/TravelExperienceMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 非遗体验表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface TravelExperienceMapper extends BaseMapper<TravelExperience> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/ITravelExperienceService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 非遗体验表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface ITravelExperienceService extends IService<TravelExperience> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/impl/TravelExperienceServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 非遗体验表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue/TravelExperienceList.vue

@@ -153,6 +153,21 @@
             align:"center",
             dataIndex: 'phone'
           },
+          {
+            title:'经度',
+            align:"center",
+            dataIndex: 'experienceLongitude'
+          },
+          {
+            title:'纬度',
+            align:"center",
+            dataIndex: 'experienceLatitude'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'experiencePrice'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -193,6 +208,9 @@
         fieldList.push({type:'Text',value:'experienceDetail',text:'非遗体验详情',dictCode:''})
         fieldList.push({type:'string',value:'openTime',text:'开放时间',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'experienceLongitude',text:'经度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'experienceLatitude',text:'纬度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'experiencePrice',text:'价格',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue/modules/TravelExperienceForm.vue

@@ -33,6 +33,21 @@
               <a-input v-model="model.phone" placeholder="请输入联系电话"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="经度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="experienceLongitude">
+              <a-input-number v-model="model.experienceLongitude" placeholder="请输入经度" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="experienceLatitude">
+              <a-input-number v-model="model.experienceLatitude" placeholder="请输入纬度" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="experiencePrice">
+              <a-input-number v-model="model.experiencePrice" placeholder="请输入价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue3/TravelExperience.data.ts

@@ -36,6 +36,21 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'phone'
    },
+   {
+    title: '经度',
+    align:"center",
+    dataIndex: 'experienceLongitude'
+   },
+   {
+    title: '纬度',
+    align:"center",
+    dataIndex: 'experienceLatitude'
+   },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'experiencePrice'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -74,4 +89,19 @@ export const formSchema: FormSchema[] = [
     field: 'phone',
     component: 'Input',
   },
+  {
+    label: '经度',
+    field: 'experienceLongitude',
+    component: 'InputNumber',
+  },
+  {
+    label: '纬度',
+    field: 'experienceLatitude',
+    component: 'InputNumber',
+  },
+  {
+    label: '价格',
+    field: 'experiencePrice',
+    component: 'InputNumber',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/controller/TravelOrderController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 预约订单表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Api(tags="预约订单表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/entity/TravelOrder.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 预约订单表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Data
@@ -47,10 +47,10 @@ public class TravelOrder implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)*/
-	@Excel(name = "订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)", width = 15)
-    @ApiModelProperty(value = "订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)")
-    private java.lang.String orderType;
+	/**订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学)*/
+	@Excel(name = "订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学)", width = 15)
+    @ApiModelProperty(value = "订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学)")
+    private java.lang.Integer orderType;
 	/**主题*/
 	@Excel(name = "主题", width = 15)
     @ApiModelProperty(value = "主题")
@@ -81,4 +81,9 @@ public class TravelOrder implements Serializable {
 	@Excel(name = "订单状态(0-待支付 1-待使用 2-已完成)", width = 15)
     @ApiModelProperty(value = "订单状态(0-待支付 1-待使用 2-已完成)")
     private java.lang.String orderStatus;
+	/**关联用户id*/
+	@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "关联用户id")
+    private java.lang.String userId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/mapper/TravelOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 预约订单表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface TravelOrderMapper extends BaseMapper<TravelOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/ITravelOrderService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 预约订单表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface ITravelOrderService extends IService<TravelOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/impl/TravelOrderServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 预约订单表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/TravelOrderList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import TravelOrderModal from './modules/TravelOrderModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'TravelOrderList',
@@ -122,7 +123,7 @@
             }
           },
           {
-            title:'订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)',
+            title:'订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学)',
             align:"center",
             dataIndex: 'orderType'
           },
@@ -164,6 +165,11 @@
             align:"center",
             dataIndex: 'orderStatus'
           },
+          {
+            title:'关联用户id',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -198,7 +204,7 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'orderType',text:'订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)',dictCode:''})
+        fieldList.push({type:'int',value:'orderType',text:'订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学)',dictCode:''})
         fieldList.push({type:'string',value:'orderTitle',text:'主题',dictCode:''})
         fieldList.push({type:'string',value:'orderPhone',text:'电话',dictCode:''})
         fieldList.push({type:'date',value:'orderDate',text:'预约日期'})
@@ -206,6 +212,7 @@
         fieldList.push({type:'BigDecimal',value:'orderPrice',text:'预约价格',dictCode:''})
         fieldList.push({type:'string',value:'itemId',text:'预约项目编号',dictCode:''})
         fieldList.push({type:'string',value:'orderStatus',text:'订单状态(0-待支付 1-待使用 2-已完成)',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/modules/TravelOrderForm.vue

@@ -4,8 +4,8 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderType">
-              <a-input v-model="model.orderType" placeholder="请输入订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)"  ></a-input>
+            <a-form-model-item label="订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderType">
+              <a-input-number v-model="model.orderType" placeholder="请输入订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学)" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -43,6 +43,11 @@
               <a-input v-model="model.orderStatus" placeholder="请输入订单状态(0-待支付 1-待使用 2-已完成)"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue3/TravelOrder.data.ts

@@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)',
+    title: '订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学)',
     align:"center",
     dataIndex: 'orderType'
    },
@@ -47,6 +47,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'orderStatus'
    },
+   {
+    title: '关联用户id',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -54,9 +59,9 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)',
+    label: '订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学)',
     field: 'orderType',
-    component: 'Input',
+    component: 'InputNumber',
   },
   {
     label: '主题',
@@ -93,4 +98,12 @@ export const formSchema: FormSchema[] = [
     field: 'orderStatus',
     component: 'Input',
   },
+  {
+    label: '关联用户id',
+    field: 'userId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"han_hai_member,nick_name,id"
+     },
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/controller/TravelShopcarController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 购物车表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Api(tags="购物车表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/entity/TravelShopcar.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 购物车表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Data
@@ -47,34 +47,18 @@ public class TravelShopcar implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**商品名称*/
-	@Excel(name = "商品名称", width = 15)
-    @ApiModelProperty(value = "商品名称")
-    private java.lang.String shopcarName;
-	/**商品规格*/
-	@Excel(name = "商品规格", width = 15)
-    @ApiModelProperty(value = "商品规格")
-    private java.lang.String shopcarParam;
-	/**商品价格*/
-	@Excel(name = "商品价格", width = 15)
-    @ApiModelProperty(value = "商品价格")
-    private java.math.BigDecimal shopcarPrice;
 	/**商品购买数量*/
 	@Excel(name = "商品购买数量", width = 15)
     @ApiModelProperty(value = "商品购买数量")
     private java.lang.Integer shopcarNumber;
-	/**商品销售量*/
-	@Excel(name = "商品销售量", width = 15)
-    @ApiModelProperty(value = "商品销售量")
-    private java.lang.Integer shopcarSales;
 	/**关联商品id*/
 	@Excel(name = "关联商品id", width = 15, dictTable = "travel_wares", dicText = "wares_title", dicCode = "id")
 	@Dict(dictTable = "travel_wares", dicText = "wares_title", dicCode = "id")
     @ApiModelProperty(value = "关联商品id")
     private java.lang.String waresId;
-	/**关联用户*/
-	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	/**关联用户id*/
+	@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-    @ApiModelProperty(value = "关联用户")
+    @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/mapper/TravelShopcarMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 购物车表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface TravelShopcarMapper extends BaseMapper<TravelShopcar> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/service/ITravelShopcarService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 购物车表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface ITravelShopcarService extends IService<TravelShopcar> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/service/impl/TravelShopcarServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 购物车表
  * @Author: jeecg-boot
- * @Date:   2024-09-25
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/vue/TravelShopcarList.vue

@@ -122,38 +122,18 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'商品名称',
-            align:"center",
-            dataIndex: 'shopcarName'
-          },
-          {
-            title:'商品规格',
-            align:"center",
-            dataIndex: 'shopcarParam'
-          },
-          {
-            title:'商品价格',
-            align:"center",
-            dataIndex: 'shopcarPrice'
-          },
           {
             title:'商品购买数量',
             align:"center",
             dataIndex: 'shopcarNumber'
           },
-          {
-            title:'商品销售量',
-            align:"center",
-            dataIndex: 'shopcarSales'
-          },
           {
             title:'关联商品id',
             align:"center",
             dataIndex: 'waresId_dictText'
           },
           {
-            title:'关联用户',
+            title:'关联用户id',
             align:"center",
             dataIndex: 'userId_dictText'
           },
@@ -191,13 +171,9 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'shopcarName',text:'商品名称',dictCode:''})
-        fieldList.push({type:'string',value:'shopcarParam',text:'商品规格',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'shopcarPrice',text:'商品价格',dictCode:''})
         fieldList.push({type:'int',value:'shopcarNumber',text:'商品购买数量',dictCode:''})
-        fieldList.push({type:'int',value:'shopcarSales',text:'商品销售量',dictCode:''})
         fieldList.push({type:'string',value:'waresId',text:'关联商品id',dictCode:"travel_wares,wares_title,id"})
-        fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"han_hai_member,nick_name,id"})
+        fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/vue/modules/TravelShopcarForm.vue

@@ -3,39 +3,19 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopcarName">
-              <a-input v-model="model.shopcarName" placeholder="请输入商品名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="商品规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopcarParam">
-              <a-input v-model="model.shopcarParam" placeholder="请输入商品规格"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="商品价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopcarPrice">
-              <a-input-number v-model="model.shopcarPrice" placeholder="请输入商品价格" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="商品购买数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopcarNumber">
               <a-input-number v-model="model.shopcarNumber" placeholder="请输入商品购买数量" style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="商品销售量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopcarSales">
-              <a-input-number v-model="model.shopcarSales" placeholder="请输入商品销售量" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联商品id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="waresId">
               <j-dict-select-tag type="list" v-model="model.waresId" dictCode="travel_wares,wares_title,id" placeholder="请选择关联商品id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="关联用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户" />
+            <a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelShopcar/vue3/TravelShopcar.data.ts

@@ -5,37 +5,17 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '商品名称',
-    align:"center",
-    dataIndex: 'shopcarName'
-   },
-   {
-    title: '商品规格',
-    align:"center",
-    dataIndex: 'shopcarParam'
-   },
-   {
-    title: '商品价格',
-    align:"center",
-    dataIndex: 'shopcarPrice'
-   },
-   {
     title: '商品购买数量',
     align:"center",
     dataIndex: 'shopcarNumber'
    },
-   {
-    title: '商品销售量',
-    align:"center",
-    dataIndex: 'shopcarSales'
-   },
    {
     title: '关联商品id',
     align:"center",
     dataIndex: 'waresId_dictText'
    },
    {
-    title: '关联用户',
+    title: '关联用户id',
     align:"center",
     dataIndex: 'userId_dictText'
    },
@@ -45,31 +25,11 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
-  {
-    label: '商品名称',
-    field: 'shopcarName',
-    component: 'Input',
-  },
-  {
-    label: '商品规格',
-    field: 'shopcarParam',
-    component: 'Input',
-  },
-  {
-    label: '商品价格',
-    field: 'shopcarPrice',
-    component: 'InputNumber',
-  },
   {
     label: '商品购买数量',
     field: 'shopcarNumber',
     component: 'InputNumber',
   },
-  {
-    label: '商品销售量',
-    field: 'shopcarSales',
-    component: 'InputNumber',
-  },
   {
     label: '关联商品id',
     field: 'waresId',
@@ -79,7 +39,7 @@ export const formSchema: FormSchema[] = [
      },
   },
   {
-    label: '关联用户',
+    label: '关联用户id',
     field: 'userId',
     component: 'JDictSelectTag',
     componentProps:{

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/controller/TravelTimeController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 时间段表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Api(tags="时间段表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/entity/TravelTime.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 时间段表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Data

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/mapper/TravelTimeMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 时间段表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface TravelTimeMapper extends BaseMapper<TravelTime> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/service/ITravelTimeService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 时间段表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 public interface ITravelTimeService extends IService<TravelTime> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelTime/service/impl/TravelTimeServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 时间段表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-27
  * @Version: V1.0
  */
 @Service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/OrderApiController.java

@@ -30,17 +30,17 @@ public class OrderApiController {
     private IndexApiService indexApiService;
 
     //时间段查询
-    @ApiOperation(value="小程序-查询预约时间段", notes="小程序-查询预约时间段")
+    @ApiOperation(value="小程序-查询预约时间段", notes="timeType：0-上午 1-下午")
     @RequestMapping(value = "/queryOrderTime", method = {RequestMethod.GET})
-    public Result<?> queryOrderTime(TravelTime travelTime){
-        return indexApiService.queryOrderTime(travelTime);
+        public Result<?> queryOrderTime(String timeType){
+        return indexApiService.queryOrderTime(timeType);
     }
 
     //查询订单信息
-    @ApiOperation(value="小程序-查询预约订单列表", notes="小程序-查询预约订单列表")
+    @ApiOperation(value="小程序-查询预约订单列表", notes="orderType：0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学")
     @RequestMapping(value = "/queryOrderList", method = {RequestMethod.GET})
-    public Result<?> queryOrderList(TravelOrder travelOrder, PageBean pageBean){
-        return indexApiService.queryOrderList(travelOrder, pageBean);
+    public Result<?> queryOrderList(String token, String  orderType, PageBean pageBean){
+        return indexApiService.queryOrderList(token, orderType, pageBean);
     }
 
     //创建订单

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/UserInfoApiController.java

@@ -41,50 +41,50 @@ public class UserInfoApiController {
     //查询地址
     @ApiOperation(value="小程序-查询地址", notes="小程序-查询地址")
     @RequestMapping(value = "/queryAddress", method = {RequestMethod.GET})
-    public Result<?> queryAddress(TravelAddress travelAddress, PageBean pageBean){
-        return indexApiService.queryAddress(travelAddress, pageBean);
+    public Result<?> queryAddress(String token, TravelAddress travelAddress, PageBean pageBean){
+        return indexApiService.queryAddress(token, travelAddress, pageBean);
     }
 
     //新增地址
     @ApiOperation(value="小程序-新增地址", notes="小程序-新增地址")
     @RequestMapping(value = "/addAddress", method = {RequestMethod.POST})
-    public Result<?> addAddress(TravelAddress travelAddress){
-        return indexApiService.addAddress(travelAddress);
+    public Result<?> addAddress(String token, TravelAddress travelAddress){
+        return indexApiService.addAddress(token, travelAddress);
     }
 
     //删除地址
     @ApiOperation(value="小程序-删除地址", notes="小程序-删除地址")
     @RequestMapping(value = "/deleteAddress", method = {RequestMethod.DELETE})
-    public Result<?> deleteAddress(String AddressId){
-        return indexApiService.deleteAddress(AddressId);
+    public Result<?> deleteAddress(String token, String AddressId){
+        return indexApiService.deleteAddress(token, AddressId);
     }
 
     //修改地址
     @ApiOperation(value="小程序-修改地址", notes="小程序-修改地址")
     @RequestMapping(value = "/updateAddress", method = {RequestMethod.POST})
-    public Result<?> updateAddress(TravelAddress travelAddress){
-        return indexApiService.updateAddress(travelAddress);
+    public Result<?> updateAddress(String token, TravelAddress travelAddress){
+        return indexApiService.updateAddress(token, travelAddress);
     }
 
     //我的收藏
     @ApiOperation(value="小程序-获取我的收藏列表", notes="小程序-获取我的收藏列表")
     @RequestMapping(value = "/queryCollectionList", method = {RequestMethod.GET})
-    public Result<?> queryCollectionList(String collectionType, PageBean pageBean){
-        return indexApiService.queryCollectionList(collectionType, pageBean);
+    public Result<?> queryCollectionList(String token, String collectionType, PageBean pageBean){
+        return indexApiService.queryCollectionList(token, collectionType, pageBean);
     }
 
     //添加收藏
     @ApiOperation(value="小程序-添加收藏", notes="小程序-添加收藏")
     @RequestMapping(value = "/addCollection", method = {RequestMethod.POST})
-    public Result<?> addCollection(TravelCollection travelCollection){
-        return indexApiService.addCollection(travelCollection);
+    public Result<?> addCollection(String token, TravelCollection travelCollection){
+        return indexApiService.addCollection(token, travelCollection);
     }
 
     //取消收藏
     @ApiOperation(value="小程序-取消收藏", notes="小程序-取消收藏")
     @RequestMapping(value = "/deleteCollection", method = {RequestMethod.POST})
-    public Result<?> deleteCollection(String collectionId){
-        return indexApiService.deleteCollection(collectionId);
+    public Result<?> deleteCollection(String token, String collectionId){
+        return indexApiService.deleteCollection(token, collectionId);
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/WaresApiController.java

@@ -39,28 +39,28 @@ public class WaresApiController {
     //获取购物车列表
     @ApiOperation(value="小程序-获取购物车列表", notes="小程序-获取购物车列表")
     @RequestMapping(value = "/queryShopcarList", method = {RequestMethod.GET})
-    public Result<?> queryShopcarList(PageBean pageBean){
-        return indexApiService.queryShopcarList(pageBean);
+    public Result<?> queryShopcarList(String token, PageBean pageBean){
+        return indexApiService.queryShopcarList(token, pageBean);
     }
 
     //添加购物车
     @ApiOperation(value="小程序-添加购物车", notes="小程序-添加购物车")
     @RequestMapping(value = "/addShopcar", method = {RequestMethod.GET})
-    public Result<?> addShopcar(TravelShopcar travelShopcar){
-        return indexApiService.addShopcar(travelShopcar);
+    public Result<?> addShopcar(String token, TravelShopcar travelShopcar){
+        return indexApiService.addShopcar(token,travelShopcar);
     }
 
     //取消购物车
     @ApiOperation(value="小程序-取消购物车", notes="小程序-取消购物车")
     @RequestMapping(value = "/deleteShopcar", method = {RequestMethod.GET})
-    public Result<?> deleteShopcar(String shopcarId){
-        return indexApiService.deleteShopcar(shopcarId);
+    public Result<?> deleteShopcar(String token, String shopcarId){
+        return indexApiService.deleteShopcar(token,shopcarId);
     }
 
     //修改购物车商品数量
     @ApiOperation(value="小程序-修改购物车信息", notes="小程序-修改购物车信息")
     @RequestMapping(value = "/updateShopcar", method = {RequestMethod.GET})
-    public Result<?> updateShopcar(TravelShopcar shopcar){
-        return indexApiService.updateShopcar(shopcar);
+    public Result<?> updateShopcar(String token, TravelShopcar shopcar){
+        return indexApiService.updateShopcar(token, shopcar);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java

@@ -59,31 +59,31 @@ public interface IndexApiService {
     public Result<?> queryExperienceById(String experienceId);
 
     //我的收藏列表
-    public Result<?> queryCollectionList(String collectionType, PageBean pageBean);
+    public Result<?> queryCollectionList(String token, String collectionType, PageBean pageBean);
 
     //添加收藏
-    public Result<?> addCollection(TravelCollection travelCollection);
+    public Result<?> addCollection(String token, TravelCollection travelCollection);
 
     //取消收藏
-    public Result<?> deleteCollection(String collectonId);
+    public Result<?> deleteCollection(String token, String collectonId);
 
     //查询地址
-    public Result<?> queryAddress(TravelAddress travelAddress, PageBean pageBean);
+    public Result<?> queryAddress(String token, TravelAddress travelAddress, PageBean pageBean);
 
     //新增地址
-    public Result<?> addAddress(TravelAddress travelAddress);
+    public Result<?> addAddress(String token, TravelAddress travelAddress);
 
     //删除地址
-    public Result<?> deleteAddress(String addressId);
+    public Result<?> deleteAddress(String token, String addressId);
 
     //修改地址
-    public Result<?> updateAddress(TravelAddress travelAddress);
+    public Result<?> updateAddress(String token, TravelAddress travelAddress);
 
     //预约时段表
-    public Result<?> queryOrderTime(TravelTime travelTime);
+    public Result<?> queryOrderTime(String timeType);
 
     //查询预约订单列表
-    public Result<?> queryOrderList(TravelOrder travelOrder, PageBean pageBean);
+    public Result<?> queryOrderList(String token, String orderType, PageBean pageBean);
 
     //获取文创好物列表
     public Result<?> queryWaresList(PageBean pageBean);
@@ -92,16 +92,16 @@ public interface IndexApiService {
     public Result<?> queryWaresById(String waresId);
 
     //获取购物车列表
-    public Result<?> queryShopcarList(PageBean pageBean);
+    public Result<?> queryShopcarList(String token, PageBean pageBean);
 
     //添加购物车
-    public Result<?> addShopcar(TravelShopcar travelShopcar);
+    public Result<?> addShopcar(String token, TravelShopcar travelShopcar);
 
     //取消购物车
-    public Result<?> deleteShopcar(String shopcarId);
+    public Result<?> deleteShopcar(String token, String shopcarId);
 
     //修改购物车信息
-    public Result<?> updateShopcar(TravelShopcar shopcar);
+    public Result<?> updateShopcar(String token, TravelShopcar shopcar);
 
 
     //文创好物-待补充

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java

@@ -3,8 +3,10 @@ package org.jeecg.modules.apiService.impl;
 import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.IndexApiService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.travelAddress.entity.TravelAddress;
 import org.jeecg.modules.travelAddress.service.ITravelAddressService;
@@ -52,6 +54,10 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //获取小程序任一文章或服务
 
+
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
     //用户表
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
@@ -448,18 +454,22 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //获取我的收藏列表
     @Override
-    public Result<?> queryCollectionList(String collectionType, PageBean pageBean) {
+    public Result<?> queryCollectionList(String token, String collectionType, PageBean pageBean) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
         Page<TravelCollection> page = new Page<TravelCollection>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<TravelCollection> pageList = null;
+        Page<TravelCollection> pageList;
 
         if(null != collectionType){
             pageList = travelCollectionService
                     .lambdaQuery()
+                    .eq(TravelCollection::getUserId, hanHaiMember.getId())
                     .eq(TravelCollection::getCollectionType, collectionType)
                     .page(page);
         }else {
             pageList = travelCollectionService
                     .lambdaQuery()
+                    .eq(TravelCollection::getUserId, hanHaiMember.getId())
                     .page(page);
         }
 
@@ -467,7 +477,10 @@ public class IndexApiServiceImpl implements IndexApiService {
     }
 
     //新增收藏
-    public Result<?> addCollection(TravelCollection travelCollection) {
+    public Result<?> addCollection(String token, TravelCollection travelCollection) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        travelCollection.setUserId(hanHaiMember.getId());
+
         boolean flag = travelCollectionService.save(travelCollection);
         if(flag){
             return Result.OK("收藏成功！");
@@ -477,7 +490,9 @@ public class IndexApiServiceImpl implements IndexApiService {
     }
 
     //取消收藏
-    public Result<?> deleteCollection(String collectionId) {
+    public Result<?> deleteCollection(String token, String collectionId) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
         boolean flag = travelCollectionService.removeById(collectionId);
         if(flag){
             return Result.OK("取消收藏成功！");
@@ -489,19 +504,22 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //获取地址列表
     @Override
-    public Result<?> queryAddress(TravelAddress travelAddress, PageBean pageBean) {
+    public Result<?> queryAddress(String token, TravelAddress travelAddress, PageBean pageBean) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
         Page<TravelAddress> page = new Page<TravelAddress>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<TravelAddress> pageList;
 
-        if(null != travelAddress.getMemberId()){
+        if(null != travelAddress.getUserId()){
             pageList = travelAddressService
                     .lambdaQuery()
-                    .eq(TravelAddress::getMemberId,travelAddress.getMemberId())
+                    .eq(TravelAddress::getUserId,hanHaiMember.getId())
                     .orderByDesc(TravelAddress::getCreateTime)
                     .page(page);
         }else {
             pageList = travelAddressService
                     .lambdaQuery()
+                    .eq(TravelAddress::getUserId,hanHaiMember.getId())
                     .orderByDesc(TravelAddress::getCreateTime)
                     .page(page);
         }
@@ -511,7 +529,10 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //新增地址
     @Override
-    public Result<?> addAddress(TravelAddress travelAddress) {
+    public Result<?> addAddress(String token, TravelAddress travelAddress) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        travelAddress.setUserId(hanHaiMember.getId());
+
         boolean flag = travelAddressService.save(travelAddress);
         if(flag){
             return Result.OK("新增地址成功！");
@@ -522,7 +543,9 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //删除地址
     @Override
-    public Result<?> deleteAddress(String addressId) {
+    public Result<?> deleteAddress(String token, String addressId) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
         boolean flag = travelAddressService.removeById(addressId);
         if(flag){
             return Result.OK("删除地址成功！");
@@ -533,16 +556,15 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //修改地址
     @Override
-    public Result<?> updateAddress(TravelAddress travelAddress) {
-        String Addressdefault = travelAddress.getAddressDefault();
-        //修改默认地址
+    public Result<?> updateAddress(String token, TravelAddress travelAddress) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         if("1".equals(travelAddress.getAddressDefault())){
             //将原默认地址改为不默认
             List<TravelAddress> list = travelAddressService
                     .lambdaQuery()
                     .eq(TravelAddress::getAddressDefault,"1")
-                    .eq(TravelAddress::getMemberId,travelAddress.getMemberId())
+                    .eq(TravelAddress::getUserId,travelAddress.getUserId())
                     .list();
 
             if(null != list){
@@ -563,13 +585,13 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //查询预约时间段
     @Override
-    public Result<?> queryOrderTime(TravelTime travelTime) {
+    public Result<?> queryOrderTime(String timeType) {
         List<TravelTime> list;
 
-        if(null != travelTime.getTimeType()){
+        if(null != timeType){
             list = travelTimeService
                     .lambdaQuery()
-                    .eq(TravelTime::getTimeType, travelTime.getTimeType())
+                    .eq(TravelTime::getTimeType, timeType)
                     .orderByAsc(TravelTime::getTimeOrder)
                     .list();
         }else {
@@ -583,19 +605,23 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //查询预约订单列表
     @Override
-    public Result<?> queryOrderList(TravelOrder travelOrder, PageBean pageBean) {
+    public Result<?> queryOrderList(String token, String orderType, PageBean pageBean) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
         Page<TravelOrder> page = new Page<TravelOrder>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<TravelOrder> pageList;
 
-        if(null != travelOrder.getOrderType()){
+        if(null != orderType){
             pageList = travelOrderService
                     .lambdaQuery()
-                    .eq(TravelOrder::getOrderType, travelOrder.getOrderType())
+                    .eq(TravelOrder::getUserId, hanHaiMember.getId())
+                    .eq(TravelOrder::getOrderType, orderType)
                     .orderByDesc(TravelOrder::getCreateTime)
                     .page(page);
         }else {
             pageList = travelOrderService
                     .lambdaQuery()
+                    .eq(TravelOrder::getUserId, hanHaiMember.getId())
                     .orderByDesc(TravelOrder::getCreateTime)
                     .page(page);
         }
@@ -629,12 +655,15 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //获取购物车列表
     @Override
-    public Result<?> queryShopcarList(PageBean pageBean) {
+    public Result<?> queryShopcarList(String token, PageBean pageBean) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
         Page<TravelShopcar> page = new Page<TravelShopcar>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<TravelShopcar> pageList;
 
         pageList = travelShopcarService
                 .lambdaQuery()
+                .eq(TravelShopcar::getUserId, hanHaiMember.getId())
                 .orderByDesc(TravelShopcar::getCreateTime)
                 .page(page);
 
@@ -643,7 +672,10 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //添加购物车
     @Override
-    public Result<?> addShopcar(TravelShopcar travelShopcar) {
+    public Result<?> addShopcar(String token, TravelShopcar travelShopcar) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        travelShopcar.setUserId(hanHaiMember.getId());
+
         boolean flag = travelShopcarService.save(travelShopcar);
         if(flag){
             return Result.OK("添加购物车成功！");
@@ -654,7 +686,9 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //取消购物车
     @Override
-    public Result<?> deleteShopcar(String shopcarId) {
+    public Result<?> deleteShopcar(String token, String shopcarId) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
         boolean flag = travelShopcarService.removeById(shopcarId);
         if(flag){
             return Result.OK("取消购物车成功！");
@@ -665,7 +699,9 @@ public class IndexApiServiceImpl implements IndexApiService {
 
     //修改购物车商品数量
     @Override
-    public Result<?> updateShopcar(TravelShopcar shopcar) {
+    public Result<?> updateShopcar(String token, TravelShopcar shopcar) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
         boolean flag = travelShopcarService.updateById(shopcar);
         if(flag){
             return Result.OK("修改购物车信息成功！");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -144,6 +144,23 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		return user;
 	}
 
+	/**
+	 * 公共验证--根据账号查询验证用户信息-客户端
+	 * @param username
+	 * @return
+	 * */
+	@Override
+	public HanHaiMember getUserByNameHanHaiXcxOpenId(String username){
+		if(oConvertUtils.isEmpty(username)) {
+			return null;
+		}
+		HanHaiMember user = hanHaiMemberService.lambdaQuery().eq(HanHaiMember::getAppletOpenid,username).one();
+		if(user==null) {
+			return null;
+		}
+		return user;
+	}
+
 
 	@Override
 	public String translateDictFromTable(String table, String text, String code, String key) {