1

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
 

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

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");
 
 
 

module-common/pom.xml

@@ -38,6 +38,12 @@
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>base-core</artifactId>
         </dependency>
+      <dependency>
+          <groupId>com.vaadin.external.google</groupId>
+          <artifactId>android-json</artifactId>
+          <version>0.0.20131108.vaadin1</version>
+          <scope>compile</scope>
+      </dependency>
 	</dependencies>
 
 </project>

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;
+    }
+}

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);
+    }
+
+
+
+
+
+}

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);
+    }
+
+
+
+
+}

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);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

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<Object> bindPhone(String phoneCode){
+        return appletLoginService.bindPhone(phoneCode);
+    }
 
 
 

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("修改成功");
     }

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);
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java

@@ -18,10 +18,10 @@ public interface AppletLoginService {
     Result<Object> appletLogin(LoginReq loginReq);
 
 
-//    /**
-//     * 微信小程序登录绑定手机号码接口
-//     * @param loginReq
-//     * @return
-//     */
-//    Result<Object> bindPhone(LoginReq loginReq);
+    /**
+     * 微信小程序登录绑定手机号码接口
+     * @param code
+     * @return
+     */
+    Result<Object> bindPhone(String  code);
 }

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<PopularizeCity> list = popularizeCityService.list();
+        return Result.OK(list);
+    }
+
+    //获取首页banner
+    @Override
+    public Result<?> getBanner(){
+        List<CommonBanner> list = commonBannerService.list();
+        return Result.OK(list);
+    }
+
+    //获取首页悦动时刻信息
+    @Override
+    public Result<?> getYueDong(){
+        List<CommonIconImage> list = commonIconImageService.list();
+        return Result.OK(list);
+    }
+
+    //获取首页活动列表带分页
+    @Override
+    public Result<?> getActivityPageList(String title,  PageBean pageBean){
+        Page<PopularizeActivity> page = new Page<PopularizeActivity>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<PopularizeActivity> 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<PopularizeTravel> page = new Page<PopularizeTravel>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<PopularizeTravel> 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<PopularizeOrder> page = new Page<PopularizeOrder>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<PopularizeOrder> 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<PopularizeOrder> page = new Page<PopularizeOrder>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<PopularizeOrder> 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<PopularizeRecruit> page = new Page<PopularizeRecruit>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<PopularizeRecruit> 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();
+    }
+
+
+
+
+
+
+
+
+
+
+
+}

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<Object> bindPhone(String code) {
+        try {
+            String phoneNumber = this.getPhoneNumber(code);
+            return Result.OK(phoneNumber);
+        }catch (Exception e){
+            return Result.error(e.getMessage());
+        }
+    }
+
 //    /**
 //     * 微信小程序登录绑定手机号码接口
 //     * @param loginReq

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="开票管理")

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;
 }

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<PopularizeInvoicing> {

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<PopularizeInvoicing> {

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

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
       }
     }

module-common/src/main/java/org/jeecg/modules/popularizeInvoicing/vue/modules/PopularizeInvoicingForm.vue

@@ -43,6 +43,16 @@
               <j-dict-select-tag type="list" v-model="model.state" dictCode="no_state_type" placeholder="请选择状态" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户标识"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
+              <a-input v-model="model.orderId" placeholder="请输入订单"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

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',
+  },
 ];

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<PopularizeSignLog, IPopularizeSignLogService> {
+	@Autowired
+	private IPopularizeSignLogService popularizeSignLogService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param popularizeSignLog
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "签到记录表-分页列表查询")
+	@ApiOperation(value="签到记录表-分页列表查询", notes="签到记录表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<PopularizeSignLog>> queryPageList(PopularizeSignLog popularizeSignLog,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PopularizeSignLog> queryWrapper = QueryGenerator.initQueryWrapper(popularizeSignLog, req.getParameterMap());
+		Page<PopularizeSignLog> page = new Page<PopularizeSignLog>(pageNo, pageSize);
+		IPage<PopularizeSignLog> pageList = popularizeSignLogService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param popularizeSignLog
+	 * @return
+	 */
+	@AutoLog(value = "签到记录表-添加")
+	@ApiOperation(value="签到记录表-添加", notes="签到记录表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> 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<String> 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<String> 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<String> 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<PopularizeSignLog> 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);
+    }
+
+}

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;
+}

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<PopularizeSignLog> {
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/mapper/xml/PopularizeSignLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.popularizeSignLog.mapper.PopularizeSignLogMapper">
+
+</mapper>

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<PopularizeSignLog> {
+
+}

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<PopularizeSignLogMapper, PopularizeSignLog> implements IPopularizeSignLogService {
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/PopularizeSignLogList.vue

@@ -0,0 +1,177 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('签到记录表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <popularize-sign-log-modal ref="modalForm" @ok="modalFormOk"></popularize-sign-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import PopularizeSignLogModal from './modules/PopularizeSignLogModal'
+
+  export default {
+    name: 'PopularizeSignLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      PopularizeSignLogModal
+    },
+    data () {
+      return {
+        description: '签到记录表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'订单标识',
+            align:"center",
+            dataIndex: 'orderId'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/popularizeSignLog/popularizeSignLog/list",
+          delete: "/popularizeSignLog/popularizeSignLog/delete",
+          deleteBatch: "/popularizeSignLog/popularizeSignLog/deleteBatch",
+          exportXlsUrl: "/popularizeSignLog/popularizeSignLog/exportXls",
+          importExcelUrl: "popularizeSignLog/popularizeSignLog/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
+        fieldList.push({type:'string',value:'orderId',text:'订单标识',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogForm.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="订单标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
+              <a-input v-model="model.orderId" placeholder="请输入订单标识"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'PopularizeSignLogForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/popularizeSignLog/popularizeSignLog/add",
+          edit: "/popularizeSignLog/popularizeSignLog/edit",
+          queryById: "/popularizeSignLog/popularizeSignLog/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <popularize-sign-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></popularize-sign-log-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import PopularizeSignLogForm from './PopularizeSignLogForm'
+
+  export default {
+    name: 'PopularizeSignLogModal',
+    components: {
+      PopularizeSignLogForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue/modules/PopularizeSignLogModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <popularize-sign-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></popularize-sign-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import PopularizeSignLogForm from './PopularizeSignLogForm'
+  export default {
+    name: 'PopularizeSignLogModal',
+    components: {
+      PopularizeSignLogForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

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});
+}

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',
+  },
+];

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLogList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <PopularizeSignLogModal @register="registerModal" @success="handleSuccess"></PopularizeSignLogModal>
+  </div>
+</template>
+
+<script lang="ts" name="popularizeSignLog-popularizeSignLog" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import PopularizeSignLogModal from './components/PopularizeSignLogModal.vue'
+  import {columns, searchFormSchema} from './popularizeSignLog.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './popularizeSignLog.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '签到记录表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"签到记录表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/components/PopularizeSignLogModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../popularizeSignLog.data';
+    import {saveOrUpdate} from '../popularizeSignLog.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

module-system/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8000
+  port: 8001
   tomcat:
     max-swallow-size: -1
   error: