diff --git a/admin-pc/.env.development b/admin-pc/.env.development index 3fe47d3..cd69ba2 100644 --- a/admin-pc/.env.development +++ b/admin-pc/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=https://popularize-admin.hhlm1688.com/popularize-admin/ +VUE_APP_API_BASE_URL=http://localhost:8001/popularize-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-pc/.env.production b/admin-pc/.env.production index 13172c7..df1d7d5 100644 --- a/admin-pc/.env.production +++ b/admin-pc/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=https://popularize-admin.hhlm1688.com/popularize-admin/ +VUE_APP_API_BASE_URL=http://localhost:8001/popularize-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/admin-pc/src/views/commonBanner/CommonBannerList.vue b/admin-pc/src/views/commonBanner/CommonBannerList.vue new file mode 100644 index 0000000..76ac89c --- /dev/null +++ b/admin-pc/src/views/commonBanner/CommonBannerList.vue @@ -0,0 +1,218 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue b/admin-pc/src/views/commonBanner/modules/CommonBannerForm.vue similarity index 100% rename from module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerForm.vue rename to admin-pc/src/views/commonBanner/modules/CommonBannerForm.vue diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.Style#Drawer.vue b/admin-pc/src/views/commonBanner/modules/CommonBannerModal.Style#Drawer.vue similarity index 100% rename from module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.Style#Drawer.vue rename to admin-pc/src/views/commonBanner/modules/CommonBannerModal.Style#Drawer.vue diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.vue b/admin-pc/src/views/commonBanner/modules/CommonBannerModal.vue similarity index 100% rename from module-common/src/main/java/org/jeecg/modules/commonBanner/vue/modules/CommonBannerModal.vue rename to admin-pc/src/views/commonBanner/modules/CommonBannerModal.vue diff --git a/admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue b/admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue new file mode 100644 index 0000000..7984839 --- /dev/null +++ b/admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue @@ -0,0 +1,327 @@ + + + + \ No newline at end of file diff --git a/admin-pc/src/views/popularizeOrder/modules/PopularizeOrderForm.vue b/admin-pc/src/views/popularizeOrder/modules/PopularizeOrderForm.vue new file mode 100644 index 0000000..61446a8 --- /dev/null +++ b/admin-pc/src/views/popularizeOrder/modules/PopularizeOrderForm.vue @@ -0,0 +1,199 @@ + + + \ No newline at end of file diff --git a/admin-pc/src/views/popularizeOrder/modules/PopularizeOrderModal.Style#Drawer.vue b/admin-pc/src/views/popularizeOrder/modules/PopularizeOrderModal.Style#Drawer.vue new file mode 100644 index 0000000..e67ec50 --- /dev/null +++ b/admin-pc/src/views/popularizeOrder/modules/PopularizeOrderModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/admin-pc/src/views/popularizeOrder/modules/PopularizeOrderModal.vue b/admin-pc/src/views/popularizeOrder/modules/PopularizeOrderModal.vue new file mode 100644 index 0000000..c20cc9e --- /dev/null +++ b/admin-pc/src/views/popularizeOrder/modules/PopularizeOrderModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/admin-pc/src/views/popularizeTravel/PopularizeTravelList.vue b/admin-pc/src/views/popularizeTravel/PopularizeTravelList.vue new file mode 100644 index 0000000..3bb5fad --- /dev/null +++ b/admin-pc/src/views/popularizeTravel/PopularizeTravelList.vue @@ -0,0 +1,321 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelForm.vue b/admin-pc/src/views/popularizeTravel/modules/PopularizeTravelForm.vue similarity index 87% rename from module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelForm.vue rename to admin-pc/src/views/popularizeTravel/modules/PopularizeTravelForm.vue index 4c6b33a..a97eb84 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelForm.vue +++ b/admin-pc/src/views/popularizeTravel/modules/PopularizeTravelForm.vue @@ -40,7 +40,7 @@ - + @@ -53,11 +53,6 @@ - - - - - @@ -85,47 +80,47 @@ - + - + - + - + - + - + - + - + - + @@ -165,6 +160,9 @@ }, confirmLoading: false, validatorRules: { + adminUser: [ + { required: true, message: '请输入主理人!'}, + ], }, url: { add: "/popularizeTravel/popularizeTravel/add", diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.Style#Drawer.vue b/admin-pc/src/views/popularizeTravel/modules/PopularizeTravelModal.Style#Drawer.vue similarity index 100% rename from module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.Style#Drawer.vue rename to admin-pc/src/views/popularizeTravel/modules/PopularizeTravelModal.Style#Drawer.vue diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.vue b/admin-pc/src/views/popularizeTravel/modules/PopularizeTravelModal.vue similarity index 100% rename from module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/modules/PopularizeTravelModal.vue rename to admin-pc/src/views/popularizeTravel/modules/PopularizeTravelModal.vue diff --git a/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java b/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java index fc15aff..cdd6f95 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java @@ -103,8 +103,8 @@ public class ApiOrderController { value="创建订单", notes="id：点击数据的标识") @PostMapping(value = "/createOrderPay") - public Result createOrderPay(@RequestHeader("X-Access-Token") String token, String id,Integer num) { - return apiIndexService.createOrderPay(token,id,num); + public Result createOrderPay(@RequestHeader("X-Access-Token") String token, String id,Integer num,String code) { + return apiIndexService.createOrderPay(token,id,num,code); } diff --git a/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java b/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java index f59c35d..17baf7a 100644 --- a/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java +++ b/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java @@ -102,7 +102,7 @@ public interface ApiIndexService { //创建订单支付 - Result createOrderPay(String token, String id,Integer num); + Result createOrderPay(String token, String id,Integer num,String code); diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java index f4d8135..82dd2fd 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java @@ -14,7 +14,6 @@ import org.jeecg.modules.commonBanner.entity.CommonBanner; import org.jeecg.modules.commonBanner.service.ICommonBannerService; import org.jeecg.modules.commonIconImage.entity.CommonIconImage; import org.jeecg.modules.commonIconImage.service.ICommonIconImageService; -import org.jeecg.modules.commonShop.entity.CommonShop; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.pay.MpWxPayService; @@ -42,7 +41,6 @@ import org.jeecg.modules.popularizeSchool.entity.PopularizeSchool; import org.jeecg.modules.popularizeSchool.service.IPopularizeSchoolService; import org.jeecg.modules.popularizeSchoolSub.entity.PopularizeSchoolSub; import org.jeecg.modules.popularizeSchoolSub.service.IPopularizeSchoolSubService; -import org.jeecg.modules.popularizeSignLog.entity.PopularizeSignLog; import org.jeecg.modules.popularizeSignLog.service.IPopularizeSignLogService; import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel; import org.jeecg.modules.popularizeTravel.service.IPopularizeTravelService; @@ -50,7 +48,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import javax.transaction.Transactional; import java.math.BigDecimal; import java.util.*; @@ -115,7 +112,10 @@ public class ApiIndexServiceImpl implements ApiIndexService { //获取首页banner @Override public Result getBanner(){ - List list = commonBannerService.list(); + List list = commonBannerService + .lambdaQuery() + .orderByDesc(CommonBanner::getSort) + .list(); return Result.OK(list); } @@ -191,7 +191,10 @@ public class ApiIndexServiceImpl implements ApiIndexService { .ge(PopularizeOrder::getState, 1) .list() ); - recruitObj.setNum(recruitObj.getPopularizeOrderList().size()); + //查询订单购票数量之和 + Integer i = popularizeOrderService.sumNumByActivityOrderIdAndState(recruit.getId(), 1); + recruitObj.setNum(i); + recruitList.add(recruitObj); } @@ -309,7 +312,14 @@ public class ApiIndexServiceImpl implements ApiIndexService { .ge(PopularizeOrder::getState, 1) .list() ); - recruitObj.setNum(recruitObj.getOrderList().size()); + + //查询订单购票数量之和 + Integer i = popularizeOrderService.sumNumByTravelOrderIdAndState(recruit.getId(), 1); + if(i == null){ + i = 0; + } + recruitObj.setNum(i); + recruitList.add(recruitObj); } page1.setRecords(recruitList); @@ -1048,7 +1058,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { //创建订单支付 @Override - public Result createOrderPay(String token, String id,Integer num){ + public Result createOrderPay(String token, String id,Integer num,String code){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //标识不能为空 if(StringUtils.isBlank(id)){ @@ -1068,6 +1078,7 @@ public class ApiIndexServiceImpl implements ApiIndexService { }else{ order.setPayPrice(order.getPrice().multiply(new BigDecimal(num))); } + order.setCode(code); popularizeOrderService.updateById(order); BigDecimal payPrice = order.getPayPrice(); diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/CommonBannerList.vue similarity index 99% rename from module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue rename to module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/CommonBannerList.vue index 395be05..ef78ac8 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue/CommonBannerList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/CommonBannerList.vue @@ -146,6 +146,7 @@ { title:'排序', align:"center", + sorter: true, dataIndex: 'sort' }, { diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerForm.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerForm.vue new file mode 100644 index 0000000..05daed0 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerForm.vue @@ -0,0 +1,139 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerModal.Style#Drawer.vue new file mode 100644 index 0000000..496d1a0 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerModal.vue b/module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerModal.vue new file mode 100644 index 0000000..1e25f38 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/commonBanner/modules/CommonBannerModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java index 026fccd..812709a 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/controller/CommonBannerController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 公共轮播图 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2025-02-13 * @Version: V1.0 */ @Api(tags="公共轮播图") @@ -66,7 +66,12 @@ public class CommonBannerController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(commonBanner, req.getParameterMap()); +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonBanner, req.getParameterMap()); +// //去掉默认按时间排序 +// queryWrapper.lambda().orderByDesc(CommonBanner::getSort); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.orderByDesc("sort"); Page page = new Page(pageNo, pageSize); IPage pageList = commonBannerService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java index e24fb50..016c591 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/entity/CommonBanner.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 公共轮播图 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2025-02-13 * @Version: V1.0 */ @Data diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java index e047c6f..66beb00 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 公共轮播图 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2025-02-13 * @Version: V1.0 */ public interface CommonBannerMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java index d3b962f..8d7b11b 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 公共轮播图 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2025-02-13 * @Version: V1.0 */ public interface ICommonBannerService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java index a72e2ee..b3a5282 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 公共轮播图 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2025-02-13 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts index 99a839a..b0381f9 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonBanner/vue3/CommonBanner.data.ts @@ -28,6 +28,7 @@ export const columns: BasicColumn[] = [ { title: '排序', align:"center", + sorter: true, dataIndex: 'sort' }, { diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java index 731f290..859589d 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/controller/PopularizeActivityController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.popularizeActivity.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -20,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit; +import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -49,6 +52,8 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class PopularizeActivityController extends JeecgController { @Autowired private IPopularizeActivityService popularizeActivityService; + @Autowired + private IPopularizeRecruitService popularizeRecruitService; /** * 分页列表查询 @@ -83,6 +88,31 @@ public class PopularizeActivityController extends JeecgController add(@RequestBody PopularizeActivity popularizeActivity) { popularizeActivityService.save(popularizeActivity); + + //增加招募记录 + PopularizeRecruit byId = popularizeRecruitService.lambdaQuery() + .eq(PopularizeRecruit::getType,"0") + .eq(PopularizeRecruit::getActivityId,popularizeActivity.getId()) + .one(); + //如果不为空则增加 + if(byId==null){ + PopularizeRecruit recruit = new PopularizeRecruit(); + recruit.setCreateBy(popularizeActivity.getCreateBy()); + recruit.setCreateTime(new Date()); + recruit.setTitle(popularizeActivity.getTitle()); + recruit.setEnTitle(popularizeActivity.getEnTitle()); + recruit.setImage(popularizeActivity.getImage()); + recruit.setStartTime(popularizeActivity.getStartTime()); + recruit.setAddress(popularizeActivity.getAddress()); + recruit.setEnAddress(popularizeActivity.getEnAddress()); + recruit.setIsOpen(popularizeActivity.getIsOpen()); + recruit.setState(1); + recruit.setNum(0); + recruit.setType("0"); + recruit.setTravelId(popularizeActivity.getId()); + popularizeRecruitService.save(recruit); + } + return Result.OK("添加成功！"); } @@ -97,6 +127,44 @@ public class PopularizeActivityController extends JeecgController edit(@RequestBody PopularizeActivity popularizeActivity) { popularizeActivityService.updateById(popularizeActivity); + //增加招募记录 + PopularizeRecruit byId = popularizeRecruitService.lambdaQuery() + .eq(PopularizeRecruit::getType,"0") + .eq(PopularizeRecruit::getActivityId,popularizeActivity.getId()) + .one(); + //如果不为空则增加 + if(byId==null){ + PopularizeRecruit recruit = new PopularizeRecruit(); + recruit.setCreateBy(popularizeActivity.getCreateBy()); + recruit.setCreateTime(new Date()); + recruit.setTitle(popularizeActivity.getTitle()); + recruit.setEnTitle(popularizeActivity.getEnTitle()); + recruit.setImage(popularizeActivity.getImage()); + recruit.setStartTime(popularizeActivity.getStartTime()); + recruit.setAddress(popularizeActivity.getAddress()); + recruit.setEnAddress(popularizeActivity.getEnAddress()); + recruit.setIsOpen(popularizeActivity.getIsOpen()); + recruit.setState(1); + recruit.setNum(0); + recruit.setType("0"); + recruit.setActivityId(popularizeActivity.getId()); + popularizeRecruitService.save(recruit); + }else{ + byId.setCreateBy(popularizeActivity.getCreateBy()); + byId.setCreateTime(new Date()); + byId.setTitle(popularizeActivity.getTitle()); + byId.setEnTitle(popularizeActivity.getEnTitle()); + byId.setImage(popularizeActivity.getImage()); + byId.setStartTime(popularizeActivity.getStartTime()); + byId.setAddress(popularizeActivity.getAddress()); + byId.setEnAddress(popularizeActivity.getEnAddress()); + byId.setIsOpen(popularizeActivity.getIsOpen()); + byId.setState(1); + byId.setNum(0); + byId.setType("0"); + byId.setActivityId(popularizeActivity.getId()); + popularizeRecruitService.updateById(byId); + } return Result.OK("编辑成功!"); } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/entity/PopularizeActivity.java b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/entity/PopularizeActivity.java index a9c8ef5..a4f9bce 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeActivity/entity/PopularizeActivity.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeActivity/entity/PopularizeActivity.java @@ -1,9 +1,6 @@ package org.jeecg.modules.popularizeActivity.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -11,9 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder; -import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/entity/PopularizeInvoicing.java b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/entity/PopularizeInvoicing.java index d31617f..6a6114c 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/entity/PopularizeInvoicing.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/entity/PopularizeInvoicing.java @@ -1,9 +1,6 @@ package org.jeecg.modules.popularizeInvoicing.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -11,11 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity; -import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder; import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel; -import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java index ee90d37..ec43b9b 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java @@ -1,17 +1,10 @@ package org.jeecg.modules.popularizeOrder.controller; import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder; import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService; @@ -20,18 +13,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; @@ -39,7 +24,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 订单列表 * @Author: jeecg-boot - * @Date: 2025-01-23 + * @Date: 2025-02-13 * @Version: V1.0 */ @Api(tags="订单列表") diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java index b6b7843..a11e655 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java @@ -1,15 +1,11 @@ package org.jeecg.modules.popularizeOrder.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; @@ -20,7 +16,7 @@ import lombok.experimental.Accessors; /** * @Description: 订单列表 * @Author: jeecg-boot - * @Date: 2025-01-23 + * @Date: 2025-02-13 * @Version: V1.0 */ @Data @@ -132,4 +128,8 @@ public class PopularizeOrder implements Serializable { @Excel(name = "电话", width = 15) @ApiModelProperty(value = "电话") private java.lang.String phone; + /**邀请码*/ + @Excel(name = "邀请码", width = 15) + @ApiModelProperty(value = "邀请码") + private java.lang.String code; } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java index 3e66939..2469b08 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java @@ -1,8 +1,7 @@ package org.jeecg.modules.popularizeOrder.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +13,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface PopularizeOrderMapper extends BaseMapper { + @Select("SELECT SUM(num) FROM popularize_order WHERE activity_order_id = #{activityOrderId} AND state >= #{state}") + Integer sumNumByActivityOrderIdAndState(@Param("activityOrderId") String activityOrderId, @Param("state") Integer state); + + + @Select("SELECT SUM(num) FROM popularize_order WHERE travel_order_id = #{travelOrderId} AND state >= #{state}") + Integer sumNumByTravelOrderIdAndState(@Param("travelOrderId") String travelOrderId, @Param("state") Integer state); + } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java index 828449d..09f6595 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java @@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IPopularizeOrderService extends IService { + + Integer sumNumByActivityOrderIdAndState(String activityOrderId, Integer state); + + + Integer sumNumByTravelOrderIdAndState(String travelOrderId, Integer state); } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java index 059b8bb..65e3b48 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java @@ -7,6 +7,8 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.annotation.Resource; + /** * @Description: 订单列表 * @Author: jeecg-boot @@ -16,4 +18,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class PopularizeOrderServiceImpl extends ServiceImpl implements IPopularizeOrderService { + + + @Resource + PopularizeOrderMapper popularizeOrderMapper; + + + @Override + public Integer sumNumByActivityOrderIdAndState(String activityOrderId, Integer state){ + return popularizeOrderMapper.sumNumByActivityOrderIdAndState(activityOrderId,state); + } + + + + @Override + public Integer sumNumByTravelOrderIdAndState(String travelOrderId, Integer state){ + return popularizeOrderMapper.sumNumByTravelOrderIdAndState(travelOrderId,state); + } + } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/PopularizeOrderList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/PopularizeOrderList.vue index 8192a87..6d31c11 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/PopularizeOrderList.vue +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/PopularizeOrderList.vue @@ -254,6 +254,11 @@ align:"center", dataIndex: 'phone' }, + { + title:'邀请码', + align:"center", + dataIndex: 'code' + }, { title: '操作', dataIndex: 'action', @@ -311,6 +316,7 @@ fieldList.push({type:'int',value:'typePrice',text:'类型',dictCode:''}) fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''}) + fieldList.push({type:'string',value:'code',text:'邀请码',dictCode:''}) this.superFieldList = fieldList } } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderForm.vue index 6326227..61446a8 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderForm.vue @@ -98,6 +98,11 @@ + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.data.ts index a017841..4850d41 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.data.ts @@ -115,6 +115,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'phone' }, + { + title: '邀请码', + align:"center", + dataIndex: 'code' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -266,4 +271,9 @@ export const formSchema: FormSchema[] = [ field: 'phone', component: 'Input', }, + { + label: '邀请码', + field: 'code', + component: 'Input', + }, ]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/controller/PopularizeRecruitController.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/controller/PopularizeRecruitController.java index 1c4e244..1dbdc34 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/controller/PopularizeRecruitController.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/controller/PopularizeRecruitController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 招募信息 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2025-02-13 * @Version: V1.0 */ @Api(tags="招募信息") diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/entity/PopularizeRecruit.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/entity/PopularizeRecruit.java index 9e73930..4bb900c 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/entity/PopularizeRecruit.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/entity/PopularizeRecruit.java @@ -24,7 +24,7 @@ import lombok.experimental.Accessors; /** * @Description: 招募信息 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2025-02-13 * @Version: V1.0 */ @Data @@ -96,8 +96,24 @@ public class PopularizeRecruit implements Serializable { @Excel(name = "参与人数", width = 15) @ApiModelProperty(value = "参与人数") private java.lang.Integer num; + /**活动*/ + @Excel(name = "活动", width = 15, dictTable = "popularize_activity", dicText = "title", dicCode = "id") + @Dict(dictTable = "popularize_activity", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "活动") + private java.lang.String activityId; + /**旅行*/ + @Excel(name = "旅行", width = 15, dictTable = "popularize_travel", dicText = "title", dicCode = "id") + @Dict(dictTable = "popularize_travel", dicText = "title", dicCode = "id") + @ApiModelProperty(value = "旅行") + private java.lang.String travelId; + /**类型*/ + @Excel(name = "类型", width = 15, dicCode = "vo_type") + @Dict(dicCode = "vo_type") + @ApiModelProperty(value = "类型") + private java.lang.String type; @TableField(exist = false) private List popularizeRecruitLogList; + } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/PopularizeRecruitMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/PopularizeRecruitMapper.java index 59dad44..3ec0411 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/PopularizeRecruitMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/mapper/PopularizeRecruitMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 招募信息 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2025-02-13 * @Version: V1.0 */ public interface PopularizeRecruitMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/IPopularizeRecruitService.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/IPopularizeRecruitService.java index 53b5b66..02dbe2c 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/IPopularizeRecruitService.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/IPopularizeRecruitService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 招募信息 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2025-02-13 * @Version: V1.0 */ public interface IPopularizeRecruitService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/impl/PopularizeRecruitServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/impl/PopularizeRecruitServiceImpl.java index f638db4..b41fddd 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/impl/PopularizeRecruitServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/service/impl/PopularizeRecruitServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 招募信息 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2025-02-13 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/PopularizeRecruitList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/PopularizeRecruitList.vue index c5d4313..055a18c 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/PopularizeRecruitList.vue +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/PopularizeRecruitList.vue @@ -40,6 +40,16 @@ + + + + + + + + + + @@ -237,6 +247,21 @@ align:"center", dataIndex: 'num' }, + { + title:'活动', + align:"center", + dataIndex: 'activityId_dictText' + }, + { + title:'旅行', + align:"center", + dataIndex: 'travelId_dictText' + }, + { + title:'类型', + align:"center", + dataIndex: 'type_dictText' + }, { title: '操作', dataIndex: 'action', @@ -285,6 +310,9 @@ fieldList.push({type:'switch',value:'isOpen',text:'是否上架 '}) fieldList.push({type:'int',value:'state',text:'是否成行',dictCode:'is_xc'}) fieldList.push({type:'int',value:'num',text:'参与人数',dictCode:''}) + fieldList.push({type:'sel_search',value:'activityId',text:'活动',dictTable:"popularize_activity", dictText:'title', dictCode:'id'}) + fieldList.push({type:'sel_search',value:'travelId',text:'旅行',dictTable:"popularize_travel", dictText:'title', dictCode:'id'}) + fieldList.push({type:'string',value:'type',text:'类型',dictCode:'vo_type'}) this.superFieldList = fieldList } } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitForm.vue index ce40092..4bdd709 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue/modules/PopularizeRecruitForm.vue @@ -58,6 +58,21 @@ + + + + + + + + + + + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.data.ts index b57d692..fac2508 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/popularizeRecruit/vue3/PopularizeRecruit.data.ts @@ -74,6 +74,21 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'num' }, + { + title: '活动', + align:"center", + dataIndex: 'activityId_dictText' + }, + { + title: '旅行', + align:"center", + dataIndex: 'travelId_dictText' + }, + { + title: '类型', + align:"center", + dataIndex: 'type_dictText' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -122,6 +137,24 @@ export const searchFormSchema: FormSchema[] = [ }, colProps: {span: 6}, }, + { + label: "活动", + field: "activityId", + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_activity,title,id" + }, + colProps: {span: 6}, + }, + { + label: "旅行", + field: "travelId", + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_travel,title,id" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -187,4 +220,28 @@ export const formSchema: FormSchema[] = [ field: 'num', component: 'InputNumber', }, + { + label: '活动', + field: 'activityId', + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_activity,title,id" + }, + }, + { + label: '旅行', + field: 'travelId', + component: 'JSearchSelect', + componentProps:{ + dict:"popularize_travel,title,id" + }, + }, + { + label: '类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"vo_type" + }, + }, ]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/controller/PopularizeTravelController.java b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/controller/PopularizeTravelController.java index 4a960ba..2d47bd4 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/controller/PopularizeTravelController.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/controller/PopularizeTravelController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.popularizeTravel.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -12,6 +13,8 @@ import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit; +import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService; import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel; import org.jeecg.modules.popularizeTravel.service.IPopularizeTravelService; @@ -39,7 +42,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 旅行信息表 * @Author: jeecg-boot - * @Date: 2025-01-13 + * @Date: 2025-02-13 * @Version: V1.0 */ @Api(tags="旅行信息表") @@ -49,7 +52,9 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class PopularizeTravelController extends JeecgController { @Autowired private IPopularizeTravelService popularizeTravelService; - + @Autowired + private IPopularizeRecruitService popularizeRecruitService; + /** * 分页列表查询 * @@ -83,6 +88,37 @@ public class PopularizeTravelController extends JeecgController add(@RequestBody PopularizeTravel popularizeTravel) { popularizeTravelService.save(popularizeTravel); + + //增加招募记录 + PopularizeRecruit byId = popularizeRecruitService.lambdaQuery() + .eq(PopularizeRecruit::getType,"1") + .eq(PopularizeRecruit::getTravelId,popularizeTravel.getId()) + .one(); + //如果不为空则增加 + if(byId==null){ + PopularizeRecruit recruit = new PopularizeRecruit(); + recruit.setCreateBy(popularizeTravel.getCreateBy()); + recruit.setCreateTime(new Date()); + recruit.setTitle(popularizeTravel.getTitle()); + recruit.setEnTitle(popularizeTravel.getEnTitle()); + recruit.setImage(popularizeTravel.getImage()); + recruit.setStartTime(popularizeTravel.getStartTime()); + recruit.setAddress(popularizeTravel.getAddress()); + recruit.setEnAddress(popularizeTravel.getEnAddress()); + recruit.setIsOpen(popularizeTravel.getIsOpen()); + recruit.setState(1); + recruit.setNum(0); + recruit.setType("1"); + recruit.setTravelId(popularizeTravel.getId()); + popularizeRecruitService.save(recruit); + } + + + + + + + return Result.OK("添加成功！"); } @@ -97,6 +133,46 @@ public class PopularizeTravelController extends JeecgController edit(@RequestBody PopularizeTravel popularizeTravel) { popularizeTravelService.updateById(popularizeTravel); + + //增加招募记录 + PopularizeRecruit byId = popularizeRecruitService.lambdaQuery() + .eq(PopularizeRecruit::getType,"1") + .eq(PopularizeRecruit::getTravelId,popularizeTravel.getId()) + .one(); + //如果不为空则增加 + if(byId==null){ + PopularizeRecruit recruit = new PopularizeRecruit(); + recruit.setCreateBy(popularizeTravel.getCreateBy()); + recruit.setCreateTime(new Date()); + recruit.setTitle(popularizeTravel.getTitle()); + recruit.setEnTitle(popularizeTravel.getEnTitle()); + recruit.setImage(popularizeTravel.getImage()); + recruit.setStartTime(popularizeTravel.getStartTime()); + recruit.setAddress(popularizeTravel.getAddress()); + recruit.setEnAddress(popularizeTravel.getEnAddress()); + recruit.setIsOpen(popularizeTravel.getIsOpen()); + recruit.setState(1); + recruit.setNum(0); + recruit.setType("1"); + recruit.setTravelId(popularizeTravel.getId()); + popularizeRecruitService.save(recruit); + }else{ + byId.setCreateBy(popularizeTravel.getCreateBy()); + byId.setCreateTime(new Date()); + byId.setTitle(popularizeTravel.getTitle()); + byId.setEnTitle(popularizeTravel.getEnTitle()); + byId.setImage(popularizeTravel.getImage()); + byId.setStartTime(popularizeTravel.getStartTime()); + byId.setAddress(popularizeTravel.getAddress()); + byId.setEnAddress(popularizeTravel.getEnAddress()); + byId.setIsOpen(popularizeTravel.getIsOpen()); + byId.setState(1); + byId.setNum(0); + byId.setType("1"); + byId.setTravelId(popularizeTravel.getId()); + popularizeRecruitService.updateById(byId); + } + return Result.OK("编辑成功!"); } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/entity/PopularizeTravel.java b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/entity/PopularizeTravel.java index 0ac425f..8dfe413 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/entity/PopularizeTravel.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/entity/PopularizeTravel.java @@ -1,9 +1,6 @@ package org.jeecg.modules.popularizeTravel.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.IdType; @@ -11,9 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder; -import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/PopularizeTravelMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/PopularizeTravelMapper.java index 2cff44b..4a53902 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/PopularizeTravelMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/mapper/PopularizeTravelMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 旅行信息表 * @Author: jeecg-boot - * @Date: 2025-01-13 + * @Date: 2025-02-13 * @Version: V1.0 */ public interface PopularizeTravelMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/PopularizeTravelList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/PopularizeTravelList.vue similarity index 98% rename from module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/PopularizeTravelList.vue rename to module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/PopularizeTravelList.vue index a222dbd..d56533a 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue/PopularizeTravelList.vue +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/PopularizeTravelList.vue @@ -214,11 +214,13 @@ { title:'活动人数', align:"center", + sorter: true, dataIndex: 'sum' }, { title:'报名人数', align:"center", + sorter: true, dataIndex: 'num' }, { @@ -231,11 +233,6 @@ align:"center", dataIndex: 'adminUser_dictText' }, - { - title:'签到人数', - align:"center", - dataIndex: 'openNum' - }, { title:'是否上架', align:"center", @@ -250,6 +247,7 @@ { title:'签到人数', align:"center", + sorter: true, dataIndex: 'doNum' }, { @@ -299,7 +297,6 @@ fieldList.push({type:'int',value:'num',text:'报名人数',dictCode:''}) fieldList.push({type:'BigDecimal',value:'price',text:'报名价格',dictCode:''}) fieldList.push({type:'sel_search',value:'adminUser',text:'主理人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) - fieldList.push({type:'string',value:'openNum',text:'签到人数',dictCode:''}) fieldList.push({type:'switch',value:'isOpen',text:'是否上架'}) fieldList.push({type:'int',value:'state',text:'活动状态',dictCode:'no_state'}) fieldList.push({type:'Text',value:'iconImage',text:'详情图',dictCode:''}) diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelForm.vue new file mode 100644 index 0000000..a97eb84 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelForm.vue @@ -0,0 +1,222 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelModal.Style#Drawer.vue new file mode 100644 index 0000000..3fd0c79 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelModal.vue new file mode 100644 index 0000000..33262c4 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/popularizeTravel/modules/PopularizeTravelModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/IPopularizeTravelService.java b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/IPopularizeTravelService.java index e9455e4..9980c3f 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/IPopularizeTravelService.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/IPopularizeTravelService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 旅行信息表 * @Author: jeecg-boot - * @Date: 2025-01-13 + * @Date: 2025-02-13 * @Version: V1.0 */ public interface IPopularizeTravelService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/impl/PopularizeTravelServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/impl/PopularizeTravelServiceImpl.java index 464fd9b..e4b71d2 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/impl/PopularizeTravelServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/service/impl/PopularizeTravelServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 旅行信息表 * @Author: jeecg-boot - * @Date: 2025-01-13 + * @Date: 2025-02-13 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.data.ts index 1f8348d..08a863a 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/popularizeTravel/vue3/PopularizeTravel.data.ts @@ -49,11 +49,13 @@ export const columns: BasicColumn[] = [ { title: '活动人数', align:"center", + sorter: true, dataIndex: 'sum' }, { title: '报名人数', align:"center", + sorter: true, dataIndex: 'num' }, { @@ -66,11 +68,6 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'adminUser_dictText' }, - { - title: '签到人数', - align:"center", - dataIndex: 'openNum' - }, { title: '是否上架', align:"center", @@ -87,6 +84,7 @@ export const columns: BasicColumn[] = [ { title: '签到人数', align:"center", + sorter: true, dataIndex: 'doNum' }, ]; @@ -187,6 +185,7 @@ export const formSchema: FormSchema[] = [ label: '报名人数', field: 'num', component: 'InputNumber', + dynamicDisabled:true }, { label: '报名价格', @@ -200,11 +199,11 @@ export const formSchema: FormSchema[] = [ componentProps:{ dict:"han_hai_member,nick_name,id" }, - }, - { - label: '签到人数', - field: 'openNum', - component: 'Input', + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入主理人!'}, + ]; + }, }, { label: '是否上架', @@ -239,46 +238,47 @@ export const formSchema: FormSchema[] = [ { label: '中文-路线说明', field: 'lx', - component: 'InputTextArea',//TODO 注意string转换问题 + component: 'JCodeEditor', //TODO String后缀暂未添加 }, { label: '英文-路线说明', field: 'enLx', - component: 'InputTextArea',//TODO 注意string转换问题 + component: 'JCodeEditor', //TODO String后缀暂未添加 }, { label: '中文-费用说明', field: 'fy', - component: 'InputTextArea',//TODO 注意string转换问题 + component: 'JCodeEditor', //TODO String后缀暂未添加 }, { label: '英文-费用说明', field: 'enFy', - component: 'InputTextArea',//TODO 注意string转换问题 + component: 'JCodeEditor', //TODO String后缀暂未添加 }, { label: '中文-需知说明', field: 'xz', - component: 'InputTextArea',//TODO 注意string转换问题 + component: 'JCodeEditor', //TODO String后缀暂未添加 }, { label: '英文-需知说明', field: 'enXz', - component: 'InputTextArea',//TODO 注意string转换问题 + component: 'JCodeEditor', //TODO String后缀暂未添加 }, { label: '中文-代理说明', field: 'dl', - component: 'InputTextArea',//TODO 注意string转换问题 + component: 'JCodeEditor', //TODO String后缀暂未添加 }, { label: '英文-代理说明', field: 'enDl', - component: 'InputTextArea',//TODO 注意string转换问题 + component: 'JCodeEditor', //TODO String后缀暂未添加 }, { label: '签到人数', field: 'doNum', component: 'InputNumber', + dynamicDisabled:true }, ]; diff --git a/module-system/src/main/resources/application-dev.yml b/module-system/src/main/resources/application-dev.yml index 3b77712..6bc61f5 100644 --- a/module-system/src/main/resources/application-dev.yml +++ b/module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8000 + port: 8001 tomcat: max-swallow-size: -1 error: @@ -22,8 +22,8 @@ management: spring: servlet: multipart: - max-file-size: 10MB - max-request-size: 10MB + max-file-size: 100MB + max-request-size: 100MB mail: host: smtp.qq.com username: