From 26af94c073e907caf108e99ae4e533a2557f07bf Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Sat, 20 Sep 2025 18:37:29 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-hanhai-vue/.env.development | 1 + admin-hanhai-vue/.env.production | 1 + .../controller/StudytourCommentController.java | 2 +- .../modules/studytourComment/entity/StudytourComment.java | 8 ++++---- .../studytourComment/mapper/StudytourCommentMapper.java | 2 +- .../studytourComment/service/IStudytourCommentService.java | 2 +- .../service/impl/StudytourCommentServiceImpl.java | 2 +- .../modules/studytourComment/vue/StudytourCommentList.vue | 6 +++--- .../controller/StudytourCommissionLogController.java | 2 +- .../entity/StudytourCommissionLog.java | 5 +++-- .../mapper/StudytourCommissionLogMapper.java | 2 +- .../service/IStudytourCommissionLogService.java | 2 +- .../service/impl/StudytourCommissionLogServiceImpl.java | 2 +- .../vue/StudytourCommissionLogList.vue | 8 ++++---- .../vue/modules/StudytourCommissionLogForm.vue | 4 ++-- .../vue3/StudytourCommissionLog.data.ts | 14 +++++++------- .../jeecg/modules/api/service/Impl/OrderServiceImpl.java | 4 ++-- 17 files changed, 35 insertions(+), 32 deletions(-) diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index 613f218..05b2728 100644 --- a/admin-hanhai-vue/.env.development +++ b/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 diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index 3a03095..2ce94fe 100644 --- a/admin-hanhai-vue/.env.production +++ b/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 \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/controller/StudytourCommentController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/controller/StudytourCommentController.java index b526746..9a6f802 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/controller/StudytourCommentController.java +++ b/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="订单评价表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/entity/StudytourComment.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/entity/StudytourComment.java index 4f83a2f..b3894cf 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/entity/StudytourComment.java +++ b/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 = "活动标题") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/mapper/StudytourCommentMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/mapper/StudytourCommentMapper.java index 609e801..b6ff7b9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/mapper/StudytourCommentMapper.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/IStudytourCommentService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/IStudytourCommentService.java index 13ffa8e..32d5159 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/IStudytourCommentService.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/impl/StudytourCommentServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/impl/StudytourCommentServiceImpl.java index bfe8b7d..c96918f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/service/impl/StudytourCommentServiceImpl.java +++ b/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 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/StudytourCommentList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/StudytourCommentList.vue index b3983b9..98d0f68 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourComment/vue/StudytourCommentList.vue +++ b/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"}) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/controller/StudytourCommissionLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/controller/StudytourCommissionLogController.java index ec0cc93..92b3fc3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/controller/StudytourCommissionLogController.java +++ b/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="佣金记录表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/entity/StudytourCommissionLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/entity/StudytourCommissionLog.java index af5f85d..84e2f6c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/entity/StudytourCommissionLog.java +++ b/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; /**获得用户*/ diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/StudytourCommissionLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/StudytourCommissionLogMapper.java index 500e9e4..c420e0f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/mapper/StudytourCommissionLogMapper.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/IStudytourCommissionLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/IStudytourCommissionLogService.java index bd870bc..24cccf1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/IStudytourCommissionLogService.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/impl/StudytourCommissionLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/impl/StudytourCommissionLogServiceImpl.java index cb1626c..47d1b9b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/service/impl/StudytourCommissionLogServiceImpl.java +++ b/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 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/StudytourCommissionLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/StudytourCommissionLogList.vue index b2dc3d2..4fa3d3f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/StudytourCommissionLogList.vue +++ b/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 } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogForm.vue index 739e91e..d3d8394 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue/modules/StudytourCommissionLogForm.vue @@ -5,12 +5,12 @@ - + - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLog.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLog.data.ts index c5d4f2d..1e0e89b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourCommissionLog/vue3/StudytourCommissionLog.data.ts +++ b/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: '获得用户', diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/OrderServiceImpl.java index b7d9c2e..809e330 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/Impl/OrderServiceImpl.java +++ b/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{ //查询订单是否存在