1、订单状态修改调整

admin-hanhai-vue/.env.development

@@ -1,4 +1,5 @@
 NODE_ENV=development
+//VUE_APP_API_BASE_URL=https://www.hongyujiaoyu.com/studytour-admin/
 VUE_APP_API_BASE_URL=http://localhost:8000/studytour-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

admin-hanhai-vue/.env.production

@@ -1,4 +1,5 @@
 NODE_ENV=production
+//VUE_APP_API_BASE_URL=https://www.hongyujiaoyu.com/studytour-admin/
 VUE_APP_API_BASE_URL=http://localhost:8000/studytour-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/controller/StudytourCommentController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-20
  * @Version: V1.0
  */
 @Api(tags="订单评价表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/entity/StudytourComment.java

@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-20
  * @Version: V1.0
  */
 @Data
@@ -60,15 +60,15 @@ public class StudytourComment implements Serializable {
 	/**行程分数*/
 	@Excel(name = "行程分数", width = 15)
     @ApiModelProperty(value = "行程分数")
-    private java.lang.Integer processScore;
+    private java.lang.Double processScore;
 	/**景点分数*/
 	@Excel(name = "景点分数", width = 15)
     @ApiModelProperty(value = "景点分数")
-    private java.lang.Integer spotScore;
+    private java.lang.Double spotScore;
 	/**导师分数*/
 	@Excel(name = "导师分数", width = 15)
     @ApiModelProperty(value = "导师分数")
-    private java.lang.Integer teacherScore;
+    private java.lang.Double teacherScore;
 	/**活动标题*/
 	@Excel(name = "活动标题", width = 15)
     @ApiModelProperty(value = "活动标题")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/mapper/StudytourCommentMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-20
  * @Version: V1.0
  */
 public interface StudytourCommentMapper extends BaseMapper<StudytourComment> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/IStudytourCommentService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-20
  * @Version: V1.0
  */
 public interface IStudytourCommentService extends IService<StudytourComment> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/impl/StudytourCommentServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 订单评价表
  * @Author: jeecg-boot
- * @Date:   2025-09-18
+ * @Date:   2025-09-20
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/StudytourCommentList.vue

@@ -199,9 +199,9 @@
         let fieldList=[];
         fieldList.push({type:'Text',value:'content',text:'文字',dictCode:''})
         fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
-        fieldList.push({type:'int',value:'processScore',text:'行程分数',dictCode:''})
-        fieldList.push({type:'int',value:'spotScore',text:'景点分数',dictCode:''})
-        fieldList.push({type:'int',value:'teacherScore',text:'导师分数',dictCode:''})
+        fieldList.push({type:'double',value:'processScore',text:'行程分数',dictCode:''})
+        fieldList.push({type:'double',value:'spotScore',text:'景点分数',dictCode:''})
+        fieldList.push({type:'double',value:'teacherScore',text:'导师分数',dictCode:''})
         fieldList.push({type:'Text',value:'activityTitle',text:'活动标题',dictCode:''})
         fieldList.push({type:'string',value:'orderId',text:'关联订单id',dictCode:"studytour_order,id,id"})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/controller/StudytourCommissionLogController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 佣金记录表
  * @Author: jeecg-boot
- * @Date:   2025-09-19
+ * @Date:   2025-09-20
  * @Version: V1.0
  */
 @Api(tags="佣金记录表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/entity/StudytourCommissionLog.java

@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 佣金记录表
  * @Author: jeecg-boot
- * @Date:   2025-09-19
+ * @Date:   2025-09-20
  * @Version: V1.0
  */
 @Data
@@ -54,7 +54,8 @@ public class StudytourCommissionLog implements Serializable {
     @ApiModelProperty(value = "佣金金额")
     private java.math.BigDecimal amount;
 	/**来源用户*/
-	@Excel(name = "来源用户", width = 15)
+	@Excel(name = "来源用户", 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 commissionId;
 	/**获得用户*/

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/StudytourCommissionLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 佣金记录表
  * @Author: jeecg-boot
- * @Date:   2025-09-19
+ * @Date:   2025-09-20
  * @Version: V1.0
  */
 public interface StudytourCommissionLogMapper extends BaseMapper<StudytourCommissionLog> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/IStudytourCommissionLogService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 佣金记录表
  * @Author: jeecg-boot
- * @Date:   2025-09-19
+ * @Date:   2025-09-20
  * @Version: V1.0
  */
 public interface IStudytourCommissionLogService extends IService<StudytourCommissionLog> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/impl/StudytourCommissionLogServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 佣金记录表
  * @Author: jeecg-boot
- * @Date:   2025-09-19
+ * @Date:   2025-09-20
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/StudytourCommissionLogList.vue

@@ -125,12 +125,12 @@
           {
             title:'佣金金额',
             align:"center",
-            dataIndex: 'amount_dictText'
+            dataIndex: 'amount'
           },
           {
             title:'来源用户',
             align:"center",
-            dataIndex: 'commissionId'
+            dataIndex: 'commissionId_dictText'
           },
           {
             title:'获得用户',
@@ -171,8 +171,8 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'sel_search',value:'amount',text:'佣金金额',dictTable:"", dictText:'', dictCode:''})
-        fieldList.push({type:'string',value:'commissionId',text:'来源用户',dictCode:"han_hai_member,nick_name,id"})
+        fieldList.push({type:'BigDecimal',value:'amount',text:'佣金金额',dictCode:''})
+        fieldList.push({type:'sel_search',value:'commissionId',text:'来源用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         fieldList.push({type:'sel_search',value:'userId',text:'获得用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogForm.vue

@@ -5,12 +5,12 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="佣金金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amount">
-              <j-search-select-tag v-model="model.amount" dict=""  />
+              <a-input-number v-model="model.amount" placeholder="请输入佣金金额" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="来源用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="commissionId">
-              <a-input v-model="model.commissionId" placeholder="请输入来源用户"  ></a-input>
+              <j-search-select-tag v-model="model.commissionId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLog.data.ts

@@ -7,12 +7,12 @@ export const columns: BasicColumn[] = [
     {
     title: '佣金金额',
     align:"center",
-    dataIndex: 'amount_dictText'
+    dataIndex: 'amount'
    },
    {
     title: '来源用户',
     align:"center",
-    dataIndex: 'commissionId'
+    dataIndex: 'commissionId_dictText'
    },
    {
     title: '获得用户',
@@ -28,15 +28,15 @@ export const formSchema: FormSchema[] = [
   {
     label: '佣金金额',
     field: 'amount',
-    component: 'JSearchSelect',
-    componentProps:{
-       dict:""
-    },
+    component: 'InputNumber',
   },
   {
     label: '来源用户',
     field: 'commissionId',
-    component: 'Input',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
   },
   {
     label: '获得用户',

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/OrderServiceImpl.java

@@ -275,8 +275,8 @@ public class OrderServiceImpl implements OrderService {
     public Result<?> updateOrder(String token, StudytourOrder studytourOrder) {
         log.info("开始修改订单");
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
 
         try{
             //查询订单是否存在