From c8f05264f7154964b91089a0c208bac61acbd3c1 Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Mon, 23 Dec 2024 22:35:59 +0800 Subject: [PATCH] 1 --- admin-pc/.env.development | 2 +- admin-pc/.env.production | 2 +- .../java/org/jeecg/config/shiro/ShiroConfig.java | 6 +- module-common/pom.xml | 6 + .../src/main/java/org/jeecg/api/bean/PageBean.java | 20 ++ .../jeecg/api/controller/ApiIndexController.java | 90 ++++++ .../jeecg/api/controller/ApiOrderController.java | 75 +++++ .../api/controller/ApiShopUserController.java | 89 ++++++ .../api/controller/AppletLoginController.java | 7 +- .../api/controller/AppletMyInfoController.java | 7 +- .../org/jeecg/api/service/ApiIndexService.java | 91 ++++++ .../org/jeecg/api/service/AppletLoginService.java | 12 +- .../api/service/impl/ApiIndexServiceImpl.java | 325 +++++++++++++++++++++ .../api/service/impl/AppletLoginServiceImpl.java | 74 ++++- .../controller/PopularizeInvoicingController.java | 2 +- .../entity/PopularizeInvoicing.java | 10 +- .../mapper/PopularizeInvoicingMapper.java | 2 +- .../service/IPopularizeInvoicingService.java | 2 +- .../impl/PopularizeInvoicingServiceImpl.java | 2 +- .../vue/PopularizeInvoicingList.vue | 12 + .../vue/modules/PopularizeInvoicingForm.vue | 10 + .../vue3/PopularizeInvoicing.data.ts | 20 ++ .../controller/PopularizeSignLogController.java | 171 +++++++++++ .../entity/PopularizeSignLog.java | 58 ++++ .../mapper/PopularizeSignLogMapper.java | 17 ++ .../mapper/xml/PopularizeSignLogMapper.xml | 5 + .../service/IPopularizeSignLogService.java | 14 + .../service/impl/PopularizeSignLogServiceImpl.java | 19 ++ .../vue/PopularizeSignLogList.vue | 177 +++++++++++ .../vue/modules/PopularizeSignLogForm.vue | 109 +++++++ .../PopularizeSignLogModal.Style#Drawer.vue | 84 ++++++ .../vue/modules/PopularizeSignLogModal.vue | 60 ++++ .../vue3/PopularizeSignLog.api.ts | 61 ++++ .../vue3/PopularizeSignLog.data.ts | 33 +++ .../vue3/PopularizeSignLogList.vue | 162 ++++++++++ .../vue3/components/PopularizeSignLogModal.vue | 58 ++++ .../src/main/resources/application-dev.yml | 2 +- 37 files changed, 1872 insertions(+), 24 deletions(-) create mode 100644 module-common/src/main/java/org/jeecg/api/bean/PageBean.java create mode 100644 module-common/src/main/java/org/jeecg/api/controller/ApiIndexController.java create mode 100644 module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java create mode 100644 module-common/src/main/java/org/jeecg/api/controller/ApiShopUserController.java create mode 100644 module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java create mode 100644 module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/controller/PopularizeSignLogController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/entity/PopularizeSignLog.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/mapper/PopularizeSignLogMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/mapper/xml/PopularizeSignLogMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/service/IPopularizeSignLogService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/service/impl/PopularizeSignLogServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/PopularizeSignLogList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLog.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLog.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLogList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/components/PopularizeSignLogModal.vue diff --git a/admin-pc/.env.development b/admin-pc/.env.development index 44b5463..a1027e4 100644 --- a/admin-pc/.env.development +++ b/admin-pc/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8000/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 951f772..fb7942b 100644 --- a/admin-pc/.env.production +++ b/admin-pc/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://localhost:8000/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/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 7503329..c180eb2 100644 --- a/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -80,9 +80,9 @@ public class ShiroConfig { //三只青蛙 - filterChainDefinitionMap.put("/rice_vip/**", "anon"); - filterChainDefinitionMap.put("/rice_info/**", "anon"); - filterChainDefinitionMap.put("/rice_index/**", "anon"); + filterChainDefinitionMap.put("/index_common/**", "anon"); + filterChainDefinitionMap.put("/order_common/**", "anon"); + filterChainDefinitionMap.put("/shop_common/**", "anon"); diff --git a/module-common/pom.xml b/module-common/pom.xml index 6f03615..56a197f 100644 --- a/module-common/pom.xml +++ b/module-common/pom.xml @@ -38,6 +38,12 @@ org.jeecgframework.boot base-core + + com.vaadin.external.google + android-json + 0.0.20131108.vaadin1 + compile + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/api/bean/PageBean.java b/module-common/src/main/java/org/jeecg/api/bean/PageBean.java new file mode 100644 index 0000000..ce83d4f --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/bean/PageBean.java @@ -0,0 +1,20 @@ +package org.jeecg.api.bean; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PageBean { + + /**显示条数*/ + @ApiModelProperty(value = "显示条数" ) + private Integer pageSize; + /**当前页*/ + @ApiModelProperty(value = "当前页" ) + private Integer pageNo; + + public PageBean() { + this.pageNo = 1; + this.pageSize = 1000; + } +} diff --git a/module-common/src/main/java/org/jeecg/api/controller/ApiIndexController.java b/module-common/src/main/java/org/jeecg/api/controller/ApiIndexController.java new file mode 100644 index 0000000..6159999 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/controller/ApiIndexController.java @@ -0,0 +1,90 @@ +package org.jeecg.api.controller; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.ApiIndexService; +import org.jeecg.common.api.vo.Result; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="推广项目-首页相关接口") +@RestController +@RequestMapping("/index_common") +@Slf4j +public class ApiIndexController { + + @Resource + private ApiIndexService apiIndexService; + + //获取首页地区 + @ApiOperation(value="获取首页地区", notes="获取首页地区") + @GetMapping(value = "/getArea") + public Result getArea() { + return apiIndexService.getArea(); + } + + //获取首页banner + @ApiOperation(value="获取首页banner", notes="获取首页banner") + @GetMapping(value = "/getBanner") + public Result getBanner() { + return apiIndexService.getBanner(); + } + + //获取首页悦动时刻信息 + @ApiOperation(value="获取首页悦动时刻信息", notes="获取首页悦动时刻信息") + @GetMapping(value = "/getYueDong") + public Result getYueDong() { + return apiIndexService.getYueDong(); + } + + //获取首页活动列表带分页 + @ApiOperation(value="获取首页活动列表带分页", notes="获取首页活动列表带分页") + @GetMapping(value = "/getActivityPageList") + public Result getActivityPageList(String title,PageBean pageBean) { + return apiIndexService.getActivityPageList(title, pageBean); + } + + //活动详情 + @ApiOperation(value="活动详情", notes="活动详情") + @GetMapping(value = "/getActivityInfo") + public Result getActivityInfo(String activityId) { + return apiIndexService.getActivityInfo(activityId); + } + + //获取旅行列表带分页 + @ApiOperation(value="获取旅行列表带分页", notes="获取旅行列表带分页") + @GetMapping(value = "/getTravelPageList") + public Result getTravelPageList(String title, PageBean pageBean) { + return apiIndexService.getTravelPageList(title, pageBean); + } + + + //旅行详情 + @ApiOperation(value="旅行详情", notes="旅行详情") + @GetMapping(value = "/getTravelInfo") + public Result getTravelInfo(String travelId) { + return apiIndexService.getTravelInfo(travelId); + } + + + + + //我的收藏 + @ApiOperation(value="我的收藏", notes="我的收藏") + @GetMapping(value = "/getCollectPageList") + public Result getCollectPageList(@RequestHeader("X-Access-Token") String token, PageBean pageBean) { + return apiIndexService.getCollectPageList(token, pageBean); + } + + + + + +} 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 new file mode 100644 index 0000000..efba79e --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java @@ -0,0 +1,75 @@ +package org.jeecg.api.controller; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.ApiIndexService; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.popularizeInvoicing.entity.PopularizeInvoicing; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags="推广项目-订单相关接口信") +@RestController +@RequestMapping("/order_common") +@Slf4j +public class ApiOrderController { + + @Resource + private ApiIndexService apiIndexService; + + + //获取订单列表数据带分页 + @ApiOperation(value="获取订单列表数据带分页", notes="获取订单列表数据带分页") + @GetMapping(value = "/getOrderPageList") + public Result getOrderPageList(@RequestHeader("X-Access-Token") String token, PageBean pageBean) { + return apiIndexService.getOrderPageList(token, pageBean); + } + + + + //根据订单标识查询订单信息 + @ApiOperation(value="根据订单标识查询订单信息", notes="根据订单标识查询订单信息") + @GetMapping(value = "/getOrderInfo") + public Result getOrderInfo(@RequestHeader("X-Access-Token") String token, String orderId) { + return apiIndexService.getOrderInfo(token,orderId); + } + + //取消订单活动 + @ApiOperation(value="取消订单活动", notes="取消订单活动") + @PostMapping(value = "/cancelOrder") + public Result cancelOrder(@RequestHeader("X-Access-Token") String token, String orderId) { + return apiIndexService.cancelOrder(token,orderId); + } + + + //订单活动签到 + @ApiOperation(value="订单活动签到", notes="订单活动签到") + @PostMapping(value = "/signIn") + public Result signIn(@RequestHeader("X-Access-Token") String token, String orderId) { + return apiIndexService.signIn(token,orderId); + } + + + //订单活动评价 + @ApiOperation(value="订单活动评价", notes="订单活动评价") + @PostMapping(value = "/evaluate") + public Result evaluate(@RequestHeader("X-Access-Token") String token, String orderId,String num, String evaluate) { + return apiIndexService.evaluate(token,orderId,num,evaluate); + } + + + //订单开具发票 + @ApiOperation(value="订单开具发票", notes="订单开具发票") + @PostMapping(value = "/invoice") + public Result invoice(@RequestHeader("X-Access-Token") String token, PopularizeInvoicing popularizeInvoicing) { + return apiIndexService.invoice(token,popularizeInvoicing); + } + + + + +} diff --git a/module-common/src/main/java/org/jeecg/api/controller/ApiShopUserController.java b/module-common/src/main/java/org/jeecg/api/controller/ApiShopUserController.java new file mode 100644 index 0000000..4994c04 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/controller/ApiShopUserController.java @@ -0,0 +1,89 @@ +package org.jeecg.api.controller; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.ApiIndexService; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.popularizeAuthentication.entity.PopularizeAuthentication; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags="推广项目-主理人接口相关") +@RestController +@RequestMapping("/shop_common") +@Slf4j +public class ApiShopUserController { + + @Resource + private ApiIndexService apiIndexService; + + + //获取招募列表数据带分页 + @ApiOperation(value="获取招募列表数据带分页", notes="获取招募列表数据带分页") + @GetMapping(value = "/getRecruitPageList") + public Result getRecruitPageList(String title, PageBean pageBean){ + return apiIndexService.getRecruitPageList(title, pageBean); + } + + + + //主理人认证 + @ApiOperation(value="主理人认证", notes="主理人认证") + @PostMapping(value = "/joinRecruit") + public Result joinRecruit(@RequestHeader("X-Access-Token") String token, PopularizeAuthentication authentication){ + return apiIndexService.joinRecruit(token,authentication); + } + + + + //主理人主理的活动列表带分页 + @ApiOperation(value="主理人主理的活动列表带分页", notes="主理人主理的活动列表带分页") + @GetMapping(value = "/getActivityMemberPageList") + public Result getActivityMemberPageList(@RequestHeader("X-Access-Token") String token, String title, PageBean pageBean){ + return apiIndexService.getActivityMemberPageList(token,title, pageBean); + } + + + //主理人主理的活动签到里面的签到用户列表带分页 + @ApiOperation(value="主理人主理的活动签到里面的签到用户列表带分页", notes="主理人主理的活动签到里面的签到用户列表带分页") + @GetMapping(value = "/getSignInUserPageList") + public Result getSignInUserPageList(String recruitId, PageBean pageBean){ + return apiIndexService.getSignInUserPageList(recruitId, pageBean); + } + + + //扫码签到 + @ApiOperation(value="扫码签到", notes="扫码签到") + @PostMapping(value = "/scanSignIn") + public Result scanSignIn(String recruitId){ + return apiIndexService.scanSignIn(recruitId); + } + + + //参与招募 + @ApiOperation(value="参与招募", notes="参与招募") + @GetMapping(value = "/shopUserAuth") + public Result shopUserAuth(@RequestHeader("X-Access-Token") String token,String recruitId){ + return apiIndexService.shopUserAuth(token,recruitId); + } + + + + + + + + + + + + + + + + +} diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java index 4f00a29..185b66b 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java @@ -32,7 +32,12 @@ public class AppletLoginController { return appletLoginService.appletLogin(loginReq); } - + //绑定手机号码 + @ApiOperation(value="绑定手机号码", notes="绑定手机号码") + @GetMapping(value = "/bindPhone") + public Result bindPhone(String phoneCode){ + return appletLoginService.bindPhone(phoneCode); + } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java index c5bab1c..b3eefe8 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java @@ -26,12 +26,9 @@ public class AppletMyInfoController { //修改个人信息 @PostMapping(value = "/updateInfo") @ApiOperation(value="修改个人信息", notes="修改个人信息") - public Result updateInfo(@RequestHeader("X-Access-Token") String token, String nickName, String avatarUrl){ + public Result updateInfo(@RequestHeader("X-Access-Token") String token,HanHaiMember member){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - HanHaiMember member = new HanHaiMember(); - member.setId(hanHaiMember.getId()); - member.setNickName(nickName); - member.setHeadImage(avatarUrl); + hanHaiMemberService.updateById(member); return Result.ok("修改成功"); } 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 new file mode 100644 index 0000000..4fc71de --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java @@ -0,0 +1,91 @@ +package org.jeecg.api.service; + +import org.jeecg.api.bean.PageBean; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.popularizeAuthentication.entity.PopularizeAuthentication; +import org.jeecg.modules.popularizeInvoicing.entity.PopularizeInvoicing; +import org.springframework.web.bind.annotation.RequestHeader; + +public interface ApiIndexService { + + //获取首页地区 + Result getArea(); + + //获取首页banner + Result getBanner(); + + //获取首页悦动时刻信息 + Result getYueDong(); + + //获取首页活动列表带分页 + Result getActivityPageList(String title, PageBean pageBean); + + //获取活动详情 + Result getActivityInfo(String activityId); + + //获取旅行列表带分页 + Result getTravelPageList(String title, PageBean pageBean); + + //旅行详情 + Result getTravelInfo(String travelId); + + + //获取我的收藏带分页 + Result getCollectPageList(String token, PageBean pageBean); + + + + + + //获取订单列表数据带分页 + Result getOrderPageList(String token,PageBean pageBean); + + //根据订单标识查询订单信息 + Result getOrderInfo(String token,String orderId); + + //取消订单活动 + Result cancelOrder(String token,String orderId); + + //订单活动签到 + Result signIn(String token,String orderId); + + //订单活动评价 + Result evaluate(String token, String orderId,String num, String evaluate); + + //订单开具发票 + Result invoice(String token, PopularizeInvoicing popularizeInvoicing); + + + + //获取招募列表数据带分页 + Result getRecruitPageList(String title, PageBean pageBean); + + //点击参与招募 + Result joinRecruit(String token, PopularizeAuthentication authentication); + + + Result getActivityMemberPageList( String token, String title, PageBean pageBean); + + + //主理人主理的活动签到里面的签到用户列表带分页 + Result getSignInUserPageList(String recruitId, PageBean pageBean); + + //扫码签到 + Result scanSignIn(String recruitId); + + //主理人认证 + Result shopUserAuth(String token,String recruitId); + + + + + + + + + + + + + +} diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java b/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java index b0dfac4..092c7e3 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java @@ -18,10 +18,10 @@ public interface AppletLoginService { Result appletLogin(LoginReq loginReq); -// /** -// * 微信小程序登录绑定手机号码接口 -// * @param loginReq -// * @return -// */ -// Result bindPhone(LoginReq loginReq); + /** + * 微信小程序登录绑定手机号码接口 + * @param code + * @return + */ + Result bindPhone(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 new file mode 100644 index 0000000..806de7e --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java @@ -0,0 +1,325 @@ +package org.jeecg.api.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.jeecg.api.bean.PageBean; +import org.jeecg.api.service.ApiIndexService; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +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.popularizeActivity.entity.PopularizeActivity; +import org.jeecg.modules.popularizeActivity.service.IPopularizeActivityService; +import org.jeecg.modules.popularizeAuthentication.entity.PopularizeAuthentication; +import org.jeecg.modules.popularizeAuthentication.service.IPopularizeAuthenticationService; +import org.jeecg.modules.popularizeCity.entity.PopularizeCity; +import org.jeecg.modules.popularizeCity.service.IPopularizeCityService; +import org.jeecg.modules.popularizeCollect.entity.PopularizeCollect; +import org.jeecg.modules.popularizeCollect.service.IPopularizeCollectService; +import org.jeecg.modules.popularizeCountry.service.IPopularizeCountryService; +import org.jeecg.modules.popularizeEvaluate.entity.PopularizeEvaluate; +import org.jeecg.modules.popularizeEvaluate.service.IPopularizeEvaluateService; +import org.jeecg.modules.popularizeInvoicing.entity.PopularizeInvoicing; +import org.jeecg.modules.popularizeInvoicing.service.IPopularizeInvoicingService; +import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder; +import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService; +import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit; +import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService; +import org.jeecg.modules.popularizeSchool.service.IPopularizeSchoolService; +import org.jeecg.modules.popularizeSignLog.service.IPopularizeSignLogService; +import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel; +import org.jeecg.modules.popularizeTravel.service.IPopularizeTravelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.transaction.Transactional; +import java.util.Date; +import java.util.List; + + +@Slf4j +@Service +public class ApiIndexServiceImpl implements ApiIndexService { + + @Autowired + private IPopularizeTravelService popularizeTravelService; + @Autowired + private IPopularizeSchoolService popularizeSchoolService; + @Autowired + private IPopularizeRecruitService popularizeRecruitService; + @Autowired + private IPopularizeOrderService popularizeOrderService; + @Autowired + private IPopularizeInvoicingService popularizeInvoicingService; + @Autowired + private IPopularizeEvaluateService popularizeEvaluateService; + @Autowired + private IPopularizeCountryService popularizeCountryService; + @Autowired + private IPopularizeCollectService popularizeCollectService; + @Autowired + private IPopularizeCityService popularizeCityService; + @Autowired + private IPopularizeSignLogService popularizeSignLogService; + @Autowired + private IPopularizeAuthenticationService popularizeAuthenticationService; + @Autowired + private IPopularizeActivityService popularizeActivityService; + + + @Autowired + private IHanHaiMemberService hanHaiMemberService; + @Autowired + private ICommonBannerService commonBannerService; + @Autowired + private ICommonIconImageService commonIconImageService; + //权限配置 + @Resource + private ShiroRealm shiroRealm; + + + //获取首页地区 + @Override + public Result getArea(){ + List list = popularizeCityService.list(); + return Result.OK(list); + } + + //获取首页banner + @Override + public Result getBanner(){ + List list = commonBannerService.list(); + return Result.OK(list); + } + + //获取首页悦动时刻信息 + @Override + public Result getYueDong(){ + List list = commonIconImageService.list(); + return Result.OK(list); + } + + //获取首页活动列表带分页 + @Override + public Result getActivityPageList(String title, PageBean pageBean){ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = popularizeActivityService + .lambdaQuery() + .orderByDesc(PopularizeActivity::getCreateTime) + .page(page); + //如果标题不为空 + if(StringUtils.isNotBlank(title)){ + page1 = popularizeActivityService + .lambdaQuery() + .like(PopularizeActivity::getTitle,title) + .orderByDesc(PopularizeActivity::getCreateTime) + .page(page); + } + return Result.OK(page1); + } + + + + @Override + public Result getActivityInfo(String activityId){ + PopularizeActivity byId = popularizeActivityService.getById(activityId); + return Result.OK(byId); + } + + + //获取旅行列表带分页 + @Override + public Result getTravelPageList(String title, PageBean pageBean){ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = popularizeTravelService + .lambdaQuery() + .orderByDesc(PopularizeTravel::getCreateTime) + .page(page); + //如果标题不为空 + if(StringUtils.isNotBlank(title)){ + page1 = popularizeTravelService + .lambdaQuery() + .like(PopularizeTravel::getTitle,title) + .orderByDesc(PopularizeTravel::getCreateTime) + .page(page); + } + return Result.OK(page1); + } + + + + @Override + public Result getTravelInfo(String travelId){ + PopularizeTravel byId = popularizeTravelService.getById(travelId); + return Result.OK(byId); + } + + + + @Override + public Result getCollectPageList(String token, PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = popularizeOrderService + .lambdaQuery() + .eq(PopularizeOrder::getUserId,hanHaiMember.getId()) + .orderByDesc(PopularizeOrder::getCreateTime) + .page(page); + return Result.OK(page1); + } + + + + + + + //获取订单列表数据带分页 + @Override + public Result getOrderPageList(String token, PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = popularizeOrderService + .lambdaQuery() + .eq(PopularizeOrder::getUserId,hanHaiMember.getId()) + .orderByDesc(PopularizeOrder::getCreateTime) + .page(page); + return Result.OK(page1); + } + + //根据订单标识查询订单信息 + @Override + public Result getOrderInfo(String token,String orderId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + PopularizeOrder byId = popularizeOrderService.getById(orderId); + return Result.OK(byId); + } + + + //取消订单活动 + @Override + public Result cancelOrder(String token,String orderId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + PopularizeOrder byId = popularizeOrderService.getById(orderId); + byId.setState("2"); + popularizeOrderService.updateById(byId); + return Result.OK("取消成功"); + } + + //订单活动签到 + @Override + public Result signIn(String token,String orderId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + PopularizeOrder byId = popularizeOrderService.getById(orderId); + byId.setState("3"); + popularizeOrderService.updateById(byId); + return Result.OK("签到成功"); + } + + + + //订单活动评价 + @Override + public Result evaluate(String token, String orderId,String num, String evaluate){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + PopularizeOrder byId = popularizeOrderService.getById(orderId); + //创建评价记录 + PopularizeEvaluate evaluateObj = new PopularizeEvaluate(); + evaluateObj.setType(byId.getType()); + evaluateObj.setUserId(hanHaiMember.getId()); + evaluateObj.setNum(num); + evaluateObj.setDetails(evaluate); + if(byId.getType().equals("0")){ + evaluateObj.setTravelId(byId.getActivityOrderId()); + }else{ + evaluateObj.setActivityId(byId.getActivityOrderId()); + } + evaluateObj.setDetails(evaluate); + boolean save = popularizeEvaluateService.save(evaluateObj); + return Result.OK("评价成功"); + } + + //订单开具发票 + @Override + public Result invoice( String token, PopularizeInvoicing popularizeInvoicing){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + PopularizeOrder byId = popularizeOrderService.getById(popularizeInvoicing.getOrderId()); + + //创建发票信息 + popularizeInvoicing.setUserId(hanHaiMember.getId()); + popularizeInvoicing.setCreateTime(new Date()); + popularizeInvoicingService.save(popularizeInvoicing); + + return Result.OK("开票成功"); + } + + + + //获取招募列表数据带分页 + @Override + public Result getRecruitPageList(String title, PageBean pageBean){ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = popularizeRecruitService + .lambdaQuery() + .orderByDesc(PopularizeRecruit::getCreateTime) + .page(page); + //如果标题不为空 + if(StringUtils.isNotBlank(title)){ + page1 = popularizeRecruitService + .lambdaQuery() + .like(PopularizeRecruit::getTitle,title) + .orderByDesc(PopularizeRecruit::getCreateTime) + .page(page); + } + return Result.OK(page1); + } + + //点击参与招募 + @Override + public Result joinRecruit(String token, PopularizeAuthentication authentication){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + authentication.setUserId(hanHaiMember.getId()); + boolean save = popularizeAuthenticationService.save(authentication); + return Result.OK("参与成功"); + } + + + @Override + public Result getActivityMemberPageList( String token, String title, PageBean pageBean){ + return Result.OK(); + } + //招募活动签到里面的签到用户列表带分页 + @Override + public Result getSignInUserPageList(String recruitId, PageBean pageBean){ + return Result.OK(); + } + + //扫码签到 + @Override + public Result scanSignIn(String recruitId){ + return Result.OK(); + } + + //主理人认证 + @Override + public Result shopUserAuth(String token,String recruitId){ + return Result.OK(); + } + + + + + + + + + + + +} diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java index 1b659a5..b509312 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java @@ -18,6 +18,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; @@ -75,7 +81,7 @@ public class AppletLoginServiceImpl implements AppletLoginService { member = new HanHaiMember(); // member.setSesssionKey(sessionKey); member.setAppletOpenid(wxOpenid); - member.setNickName("瑶都墙友"+System.currentTimeMillis()); + member.setNickName("发布用户"+System.currentTimeMillis()); member.setHeadImage(loginReq.getHeadimgurl()); // 生成token返回给小程序端 String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid); @@ -116,6 +122,72 @@ public class AppletLoginServiceImpl implements AppletLoginService { } + + + // private static final String APP_ID = mpAppId; // 替换为你的小程序AppID +// private static final String APP_SECRET = "YOUR_APP_SECRET"; // 替换为你的小程序AppSecret + private static final String TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s"; + + public String getAccessToken() throws Exception { + String requestUrl = String.format(TOKEN_URL, mpAppId, mpAppSecret); + URL url = new URL(requestUrl); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("GET"); + + try (BufferedReader br = new BufferedReader( + new InputStreamReader(conn.getInputStream(), "UTF-8"))) { + StringBuilder response = new StringBuilder(); + String responseLine; + while ((responseLine = br.readLine()) != null) { + response.append(responseLine.trim()); + } + + org.json.JSONObject jsonResponse = new org.json.JSONObject(response.toString()); + return jsonResponse.getString("access_token"); + } + } + + private static final String API_URL = "https://api.weixin.qq.com/wxa/business/getuserphonenumber"; + + public String getPhoneNumber(String code) throws Exception { + URL url = new URL(API_URL + "?access_token=" + this.getAccessToken()); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("POST"); + conn.setRequestProperty("Content-Type", "application/json; utf-8"); + conn.setRequestProperty("Accept", "application/json"); + conn.setDoOutput(true); + + JSONObject jsonInput = new JSONObject(); + jsonInput.put("code", code); + + try (DataOutputStream os = new DataOutputStream(conn.getOutputStream())) { + byte[] input = jsonInput.toString().getBytes(StandardCharsets.UTF_8); + os.write(input, 0, input.length); + } + + try (BufferedReader br = new BufferedReader( + new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) { + StringBuilder response = new StringBuilder(); + String responseLine; + while ((responseLine = br.readLine()) != null) { + response.append(responseLine.trim()); + } + //获取手机号码 + return response.toString(); + } + } + + @Transactional(rollbackFor = Exception.class) + @Override + public Result bindPhone(String code) { + try { + String phoneNumber = this.getPhoneNumber(code); + return Result.OK(phoneNumber); + }catch (Exception e){ + return Result.error(e.getMessage()); + } + } + // /** // * 微信小程序登录绑定手机号码接口 // * @param loginReq diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/controller/PopularizeInvoicingController.java b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/controller/PopularizeInvoicingController.java index ef75c8b..6ebc8e5 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/controller/PopularizeInvoicingController.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/controller/PopularizeInvoicingController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 开票管理 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2024-12-23 * @Version: V1.0 */ @Api(tags="开票管理") 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 37b1cee..2413b6f 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 @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 开票管理 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2024-12-23 * @Version: V1.0 */ @Data @@ -84,4 +84,12 @@ public class PopularizeInvoicing implements Serializable { @Dict(dicCode = "no_state_type") @ApiModelProperty(value = "状态") private java.lang.String state; + /**用户标识*/ + @Excel(name = "用户标识", width = 15) + @ApiModelProperty(value = "用户标识") + private java.lang.String userId; + /**订单*/ + @Excel(name = "订单", width = 15) + @ApiModelProperty(value = "订单") + private java.lang.String orderId; } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/PopularizeInvoicingMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/PopularizeInvoicingMapper.java index 9cd6e33..c7376c2 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/PopularizeInvoicingMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/mapper/PopularizeInvoicingMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 开票管理 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2024-12-23 * @Version: V1.0 */ public interface PopularizeInvoicingMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/IPopularizeInvoicingService.java b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/IPopularizeInvoicingService.java index b287b16..999357f 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/IPopularizeInvoicingService.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/IPopularizeInvoicingService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 开票管理 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2024-12-23 * @Version: V1.0 */ public interface IPopularizeInvoicingService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/impl/PopularizeInvoicingServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/impl/PopularizeInvoicingServiceImpl.java index 34d595d..2edadf4 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/impl/PopularizeInvoicingServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/service/impl/PopularizeInvoicingServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 开票管理 * @Author: jeecg-boot - * @Date: 2024-12-19 + * @Date: 2024-12-23 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/PopularizeInvoicingList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/PopularizeInvoicingList.vue index 77b878a..aed9807 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/PopularizeInvoicingList.vue +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/PopularizeInvoicingList.vue @@ -168,6 +168,16 @@ align:"center", dataIndex: 'state_dictText' }, + { + title:'用户标识', + align:"center", + dataIndex: 'userId' + }, + { + title:'订单', + align:"center", + dataIndex: 'orderId' + }, { title: '操作', dataIndex: 'action', @@ -211,6 +221,8 @@ fieldList.push({type:'string',value:'no',text:'税号',dictCode:''}) fieldList.push({type:'string',value:'emil',text:'邮箱',dictCode:''}) fieldList.push({type:'string',value:'state',text:'状态',dictCode:'no_state_type'}) + fieldList.push({type:'string',value:'userId',text:'用户标识',dictCode:''}) + fieldList.push({type:'string',value:'orderId',text:'订单',dictCode:''}) this.superFieldList = fieldList } } diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingForm.vue index b2ce973..2d17548 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingForm.vue @@ -43,6 +43,16 @@ + + + + + + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.data.ts index 2014add..1b3a927 100644 --- a/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue3/PopularizeInvoicing.data.ts @@ -50,6 +50,16 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'state_dictText' }, + { + title: '用户标识', + align:"center", + dataIndex: 'userId' + }, + { + title: '订单', + align:"center", + dataIndex: 'orderId' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -111,4 +121,14 @@ export const formSchema: FormSchema[] = [ dictCode:"no_state_type" }, }, + { + label: '用户标识', + field: 'userId', + component: 'Input', + }, + { + label: '订单', + field: 'orderId', + component: 'Input', + }, ]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/controller/PopularizeSignLogController.java b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/controller/PopularizeSignLogController.java new file mode 100644 index 0000000..5e54abb --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/controller/PopularizeSignLogController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.popularizeSignLog.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.popularizeSignLog.entity.PopularizeSignLog; +import org.jeecg.modules.popularizeSignLog.service.IPopularizeSignLogService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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; + + /** + * @Description: 签到记录表 + * @Author: jeecg-boot + * @Date: 2024-12-23 + * @Version: V1.0 + */ +@Api(tags="签到记录表") +@RestController +@RequestMapping("/popularizeSignLog/popularizeSignLog") +@Slf4j +public class PopularizeSignLogController extends JeecgController { + @Autowired + private IPopularizeSignLogService popularizeSignLogService; + + /** + * 分页列表查询 + * + * @param popularizeSignLog + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "签到记录表-分页列表查询") + @ApiOperation(value="签到记录表-分页列表查询", notes="签到记录表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(PopularizeSignLog popularizeSignLog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(popularizeSignLog, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = popularizeSignLogService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param popularizeSignLog + * @return + */ + @AutoLog(value = "签到记录表-添加") + @ApiOperation(value="签到记录表-添加", notes="签到记录表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PopularizeSignLog popularizeSignLog) { + popularizeSignLogService.save(popularizeSignLog); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param popularizeSignLog + * @return + */ + @AutoLog(value = "签到记录表-编辑") + @ApiOperation(value="签到记录表-编辑", notes="签到记录表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody PopularizeSignLog popularizeSignLog) { + popularizeSignLogService.updateById(popularizeSignLog); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "签到记录表-通过id删除") + @ApiOperation(value="签到记录表-通过id删除", notes="签到记录表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + popularizeSignLogService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "签到记录表-批量删除") + @ApiOperation(value="签到记录表-批量删除", notes="签到记录表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.popularizeSignLogService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "签到记录表-通过id查询") + @ApiOperation(value="签到记录表-通过id查询", notes="签到记录表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PopularizeSignLog popularizeSignLog = popularizeSignLogService.getById(id); + if(popularizeSignLog==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(popularizeSignLog); + } + + /** + * 导出excel + * + * @param request + * @param popularizeSignLog + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PopularizeSignLog popularizeSignLog) { + return super.exportXls(request, popularizeSignLog, PopularizeSignLog.class, "签到记录表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PopularizeSignLog.class); + } + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/entity/PopularizeSignLog.java b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/entity/PopularizeSignLog.java new file mode 100644 index 0000000..e60f05d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/entity/PopularizeSignLog.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.popularizeSignLog.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; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 签到记录表 + * @Author: jeecg-boot + * @Date: 2024-12-23 + * @Version: V1.0 + */ +@Data +@TableName("popularize_sign_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="popularize_sign_log对象", description="签到记录表") +public class PopularizeSignLog implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**用户*/ + @Excel(name = "用户", width = 15) + @ApiModelProperty(value = "用户") + private java.lang.String userId; + /**订单标识*/ + @Excel(name = "订单标识", width = 15) + @ApiModelProperty(value = "订单标识") + private java.lang.String orderId; +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/mapper/PopularizeSignLogMapper.java b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/mapper/PopularizeSignLogMapper.java new file mode 100644 index 0000000..4f1c8f4 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/mapper/PopularizeSignLogMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.popularizeSignLog.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.popularizeSignLog.entity.PopularizeSignLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 签到记录表 + * @Author: jeecg-boot + * @Date: 2024-12-23 + * @Version: V1.0 + */ +public interface PopularizeSignLogMapper extends BaseMapper { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/mapper/xml/PopularizeSignLogMapper.xml b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/mapper/xml/PopularizeSignLogMapper.xml new file mode 100644 index 0000000..f1a1d4e --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/mapper/xml/PopularizeSignLogMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/service/IPopularizeSignLogService.java b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/service/IPopularizeSignLogService.java new file mode 100644 index 0000000..f10ac72 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/service/IPopularizeSignLogService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.popularizeSignLog.service; + +import org.jeecg.modules.popularizeSignLog.entity.PopularizeSignLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 签到记录表 + * @Author: jeecg-boot + * @Date: 2024-12-23 + * @Version: V1.0 + */ +public interface IPopularizeSignLogService extends IService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/service/impl/PopularizeSignLogServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/service/impl/PopularizeSignLogServiceImpl.java new file mode 100644 index 0000000..abf0677 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/service/impl/PopularizeSignLogServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.popularizeSignLog.service.impl; + +import org.jeecg.modules.popularizeSignLog.entity.PopularizeSignLog; +import org.jeecg.modules.popularizeSignLog.mapper.PopularizeSignLogMapper; +import org.jeecg.modules.popularizeSignLog.service.IPopularizeSignLogService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 签到记录表 + * @Author: jeecg-boot + * @Date: 2024-12-23 + * @Version: V1.0 + */ +@Service +public class PopularizeSignLogServiceImpl extends ServiceImpl implements IPopularizeSignLogService { + +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/PopularizeSignLogList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/PopularizeSignLogList.vue new file mode 100644 index 0000000..423a83d --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/PopularizeSignLogList.vue @@ -0,0 +1,177 @@ + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogForm.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogForm.vue new file mode 100644 index 0000000..65d8aa1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogModal.Style#Drawer.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogModal.Style#Drawer.vue new file mode 100644 index 0000000..c787a16 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogModal.vue new file mode 100644 index 0000000..c7f5595 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLog.api.ts b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLog.api.ts new file mode 100644 index 0000000..5d18518 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLog.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/popularizeSignLog/popularizeSignLog/list', + save='/popularizeSignLog/popularizeSignLog/add', + edit='/popularizeSignLog/popularizeSignLog/edit', + deleteOne = '/popularizeSignLog/popularizeSignLog/delete', + deleteBatch = '/popularizeSignLog/popularizeSignLog/deleteBatch', + importExcel = '/popularizeSignLog/popularizeSignLog/importExcel', + exportXls = '/popularizeSignLog/popularizeSignLog/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLog.data.ts b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLog.data.ts new file mode 100644 index 0000000..b8942f1 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLog.data.ts @@ -0,0 +1,33 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '用户', + align:"center", + dataIndex: 'userId' + }, + { + title: '订单标识', + align:"center", + dataIndex: 'orderId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '用户', + field: 'userId', + component: 'Input', + }, + { + label: '订单标识', + field: 'orderId', + component: 'Input', + }, +]; diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLogList.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLogList.vue new file mode 100644 index 0000000..f419ddc --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLogList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/components/PopularizeSignLogModal.vue b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/components/PopularizeSignLogModal.vue new file mode 100644 index 0000000..ccbfe56 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/components/PopularizeSignLogModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/module-system/src/main/resources/application-dev.yml b/module-system/src/main/resources/application-dev.yml index 93deac2..e5a4b49 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: