代码修复

admin-pc/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8001/popularize-admin/
+VUE_APP_API_BASE_URL=http://localhost:8005/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:8001/popularize-admin/
+VUE_APP_API_BASE_URL=http://localhost:8005/popularize-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

module-common/src/main/java/org/jeecg/api/controller/ApiIndexController.java

@@ -54,8 +54,8 @@ public class ApiIndexController {
     //活动详情
     @ApiOperation(value="活动详情", notes="活动详情")
     @GetMapping(value = "/getActivityInfo")
-    public Result<?> getActivityInfo(String activityId) {
-        return apiIndexService.getActivityInfo(activityId);
+    public Result<?> getActivityInfo(String token,String activityId) {
+        return apiIndexService.getActivityInfo(token,activityId);
     }
 
     //获取旅行列表带分页
@@ -69,8 +69,8 @@ public class ApiIndexController {
     //旅行详情
     @ApiOperation(value="旅行详情", notes="旅行详情")
     @GetMapping(value = "/getTravelInfo")
-    public Result<?> getTravelInfo(String travelId) {
-        return apiIndexService.getTravelInfo(travelId);
+    public Result<?> getTravelInfo(String token,String travelId) {
+        return apiIndexService.getTravelInfo(token,travelId);
     }
 
 

module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java

@@ -98,9 +98,14 @@ public class ApiOrderController {
 
 
 
-
-
-
+    //吊起支付、传入token跟订单标识和数量
+    @ApiOperation(
+            value="创建订单",
+            notes="id：点击数据的标识")
+    @PostMapping(value = "/createOrderPay")
+    public Result<?> createOrderPay(@RequestHeader("X-Access-Token") String token, String id,Integer num) {
+        return apiIndexService.createOrderPay(token,id,num);
+    }
 
 
 

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

@@ -21,13 +21,13 @@ public interface ApiIndexService {
     Result<?> getActivityPageList(String title,String state,String timeStr,String cityId, PageBean pageBean);
 
     //获取活动详情
-    Result<?> getActivityInfo(String activityId);
+    Result<?> getActivityInfo(String token,String activityId);
 
     //获取旅行列表带分页
     Result<?> getTravelPageList(String title, String state,String timeStr,PageBean pageBean);
 
     //旅行详情
-    Result<?> getTravelInfo(String travelId);
+    Result<?> getTravelInfo(String token,String travelId);
 
 
     //获取我的收藏带分页
@@ -100,6 +100,12 @@ public interface ApiIndexService {
     //创建订单
     Result<?> createOrder(String token, String id,Integer typePrice,Integer type);
 
+
+    //创建订单支付
+    Result<?> createOrderPay(String token, String id,Integer num);
+
+
+
     //商城-支付回调
     Object payNotify(String requestBody);
 

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

@@ -157,7 +157,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         if(StringUtils.isNotBlank(cityId)){
             page1 = popularizeActivityService
                     .lambdaQuery()
-                    .eq(PopularizeActivity::getAddress,cityId)
+                    .eq(PopularizeActivity::getCityId,cityId)
                     .eq(PopularizeActivity::getState,state)
                     .orderByDesc(PopularizeActivity::getCreateTime)
                     .page(page);
@@ -193,7 +193,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
 
     @Override
-    public Result<?> getActivityInfo(String activityId){
+    public Result<?> getActivityInfo(String token,String activityId){
         Map<String,Object> map = new HashMap<>();
         PopularizeActivity byId = popularizeActivityService.getById(activityId);
         map.put("activityInfo",byId);
@@ -207,6 +207,26 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 .eq(PopularizeAuthentication::getState, "1")
                 .one();
         map.put("adminUser",one);
+
+        //如果token不为空
+        if(StringUtils.isNotBlank(token)){
+            HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+            //查询是否收藏了
+            PopularizeCollect one1 = popularizeCollectService
+                    .lambdaQuery()
+                    .eq(PopularizeCollect::getUserId, member.getId())
+                    .eq(PopularizeCollect::getActivityId, activityId)
+                    .one();
+            if(one1!=null){
+                map.put("collect",true);
+            }else{
+                map.put("collect",false);
+            }
+        }
+
+
+
+
         return Result.OK(map);
     }
 
@@ -237,6 +257,14 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                     .orderByDesc(PopularizeTravel::getCreateTime)
                     .page(page);
         }
+        //如果状态不为空
+        if(StringUtils.isNotBlank(state)){
+            page1 = popularizeTravelService
+                    .lambdaQuery()
+                    .eq(PopularizeTravel::getState,state)
+                    .orderByDesc(PopularizeTravel::getCreateTime)
+                    .page(page);
+        }
 
         //得到集合
         List<PopularizeTravel> records = page1.getRecords();
@@ -255,18 +283,14 @@ public class ApiIndexServiceImpl implements ApiIndexService {
             recruitObj.setNum(recruitObj.getOrderList().size());
             recruitList.add(recruitObj);
         }
-
         page1.setRecords(recruitList);
-
         return Result.OK(page1);
     }
 
 
 
     @Override
-    public Result<?> getTravelInfo(String travelId){
-
-
+    public Result<?> getTravelInfo(String token,String travelId){
         Map<String,Object> map = new HashMap<>();
         PopularizeTravel byId = popularizeTravelService.getById(travelId);
         map.put("travel",byId);
@@ -280,7 +304,21 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 .eq(PopularizeAuthentication::getState, "1")
                 .one();
         map.put("adminUser",one);
-
+        //如果token不为空
+        if(StringUtils.isNotBlank(token)){
+            HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+            //查询是否收藏了
+            PopularizeCollect one1 = popularizeCollectService
+                    .lambdaQuery()
+                    .eq(PopularizeCollect::getUserId, member.getId())
+                    .eq(PopularizeCollect::getTravelId, travelId)
+                    .one();
+            if(one1!=null){
+                map.put("collect",true);
+            }else{
+                map.put("collect",false);
+            }
+        }
         return Result.OK(map);
     }
 
@@ -289,20 +327,38 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     @Override
     public Result<?> getCollectPageList(String token,String type, PageBean pageBean){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        Page<PopularizeOrder> page = new Page<PopularizeOrder>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<PopularizeOrder> page1 = popularizeOrderService
+        Page<PopularizeCollect> page = new Page<PopularizeCollect>(pageBean.getPageNo(), pageBean.getPageSize());
+        //必须传入type
+        if(StringUtils.isBlank(type)){
+            return Result.error("类型不能为空");
+        }
+        Page<PopularizeCollect> page1 = popularizeCollectService
                 .lambdaQuery()
-                .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
-                .orderByDesc(PopularizeOrder::getCreateTime)
+                .eq(PopularizeCollect::getUserId,hanHaiMember.getId())
+                .eq(PopularizeCollect::getType,type)
+                .orderByDesc(PopularizeCollect::getCreateTime)
                 .page(page);
         if(StringUtils.isNotBlank(type)){
-            page1 = popularizeOrderService
+            page1 = popularizeCollectService
                     .lambdaQuery()
-                    .eq(PopularizeOrder::getUserId,hanHaiMember.getId())
-                    .eq(PopularizeOrder::getType,type)
-                    .orderByDesc(PopularizeOrder::getCreateTime)
+                    .eq(PopularizeCollect::getUserId,hanHaiMember.getId())
+                    .eq(PopularizeCollect::getType,type)
+                    .orderByDesc(PopularizeCollect::getCreateTime)
                     .page(page);
         }
+        List<PopularizeCollect> records = page1.getRecords();
+        //创建一个新的集合
+        List<PopularizeCollect> collectList = new ArrayList<>();
+        for (PopularizeCollect collect : records) {
+            if(collect.getType().equals("1")){
+                collect.setTravelObject(popularizeTravelService.getById(collect.getTravelId()));
+            }
+            if(collect.getType().equals("0")){
+                collect.setActivityObject(popularizeActivityService.getById(collect.getActivityId()));
+            }
+            collectList.add(collect);
+        }
+        page1.setRecords(collectList);
         return Result.OK(page1);
     }
 
@@ -349,8 +405,44 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     @Override
     public Result<?> getOrderInfo(String token,String orderId){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Map map = new HashMap();
         PopularizeOrder byId = popularizeOrderService.getById(orderId);
-        return Result.OK(byId);
+        map.put("orderDetails",byId);
+        //获取订单类型
+        PopularizeActivity activity = new PopularizeActivity();
+        PopularizeTravel travel = new PopularizeTravel();
+        //获取主理人信息
+        PopularizeAuthentication authentication = new PopularizeAuthentication();
+        HanHaiMember byId1 = new HanHaiMember();
+        PopularizeAuthentication one = new PopularizeAuthentication();
+        if(byId.getType().equals("0")){
+             activity = popularizeActivityService.getById(byId.getActivityOrderId());
+             //根据活动中主理人用户标识查询用户信息
+             byId1 = hanHaiMemberService.getById(activity.getAdminUser());
+
+             one = popularizeAuthenticationService
+                .lambdaQuery()
+                .eq(PopularizeAuthentication::getUserId, byId1.getId())
+                .eq(PopularizeAuthentication::getState, "1")
+                .one();
+        }else{
+             travel = popularizeTravelService.getById(byId.getTravelOrderId());
+             //根据活动中主理人用户标识查询用户信息
+             byId1 = hanHaiMemberService.getById(travel.getAdminUser());
+
+             one = popularizeAuthenticationService
+                    .lambdaQuery()
+                    .eq(PopularizeAuthentication::getUserId, byId1.getId())
+                    .eq(PopularizeAuthentication::getState, "1")
+                    .one();
+        }
+        map.put("activity",activity);
+        map.put("travel",travel);
+        map.put("adminUserInfo",byId1);
+        map.put("adminUser",one);
+
+
+        return Result.OK(map);
     }
 
 
@@ -581,15 +673,16 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 .one();
         if(one!=null){
             //审核成功
-            if(one.getState().equals("1")){
+            if(one.getState() == 1){
                 return Result.OK("您已经成为了主理人,请不要重复提交");
-            }else if(one.getState().equals("2")){
+            }else if(one.getState()==2){
                 authentication.setId(one.getId());
                 authentication.setUserId(hanHaiMember.getId());
                 boolean save = popularizeAuthenticationService.updateById(authentication);
                 return Result.OK("参与成功");
             }else{
                 authentication.setId(one.getId());
+                authentication.setState(0);
                 authentication.setUserId(hanHaiMember.getId());
                 boolean save = popularizeAuthenticationService.updateById(authentication);
                 return Result.OK("您已经提交了,请等待审核");
@@ -597,6 +690,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
         }else{
             authentication.setUserId(hanHaiMember.getId());
+            authentication.setState(0);
             boolean save = popularizeAuthenticationService.saveOrUpdate(authentication);
         }
         return Result.OK("参与成功");
@@ -634,7 +728,10 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     @Override
     public Result<?> getSignInUserPageList(String token, String recruitId, PageBean pageBean){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        Page<PopularizeSignLog> page = new Page<PopularizeSignLog>(pageBean.getPageNo(), pageBean.getPageSize());
+//        Page<PopularizeSignLog> page = new Page<PopularizeSignLog>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<PopularizeSignLog> page = popularizeSignLogService
+                .lambdaQuery()
+                .page(new Page<>(pageBean.getPageNo(), pageBean.getPageSize()));
         return Result.OK(page);
     }
 
@@ -705,6 +802,49 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     }
 
 
+    //创建订单支付
+    @Override
+    public Result<?> createOrderPay(String token, String id,Integer num){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //标识不能为空
+        if(StringUtils.isBlank(id)){
+            return Result.error("标识不能为空");
+        }
+
+        //数量不能为空
+        if(num == null){
+            return Result.error("数量不能为空");
+        }
+        PopularizeOrder order = popularizeOrderService.getById(id);
+        //修改订单数量
+        order.setNum(num);
+        if(order.getType().equals("0")){
+            //修改订单价格
+            order.setPayPrice(order.getPayPrice().multiply(new BigDecimal(num)));
+        }else{
+            order.setPayPrice(order.getPrice().multiply(new BigDecimal(num)));
+        }
+
+        popularizeOrderService.updateById(order);
+        BigDecimal payPrice = order.getPayPrice();
+
+        //吊起微信支付
+        String s = payPrice.multiply(new BigDecimal(100)).toString();
+        int i1 = Double.valueOf(s).intValue();
+        Object appOrder = mpWxPayService.createOrder(
+                "购买"+order.getTitle(),
+                "127.0.0.1",
+                order.getId(),
+                i1,
+                order.getId(),
+                hanHaiMember.getAppletOpenid(),
+                order.toString());
+
+        return Result.OK("支付成功",appOrder);
+
+    }
+
+
     public Result<?> createOrderTravel(String token, String id){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //判断活动标识不能为空
@@ -729,6 +869,9 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 .lambdaQuery()
                 .eq(PopularizeOrder::getTravelOrderId, id)
                 .eq(PopularizeOrder::getUserId, hanHaiMember.getId())
+                //状态不等于0，3
+                .ne(PopularizeOrder::getState, "0")
+                .ne(PopularizeOrder::getState, "3")
                 .one();
         if(order!=null){
             return Result.error("已报名该旅行,请不要重复报名！");
@@ -749,13 +892,15 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         PopularizeOrder popularizeOrder = new PopularizeOrder();
         popularizeOrder.setId(orderId);
         popularizeOrder.setActivityOrderId(id);
+        popularizeOrder.setTravelOrderId(id);
         popularizeOrder.setUserId(hanHaiMember.getId());
-        popularizeOrder.setType("0"); //0活动1旅行
+        popularizeOrder.setType("1"); //0活动1旅行
         popularizeOrder.setTitle(byId.getTitle());
         popularizeOrder.setImage(byId.getImage());
         popularizeOrder.setStartTime(byId.getStartTime());
         popularizeOrder.setAddress(byId.getAddress());
         popularizeOrder.setPrice(byId.getPrice()); //活动价格
+        popularizeOrder.setPayPrice(payPrice);
         popularizeOrder.setNum(1);
         popularizeOrder.setState("0");
         popularizeOrder.setCreateTime(new Date());
@@ -765,19 +910,23 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         popularizeOrderService.save(popularizeOrder);
 
 
-        //吊起微信支付
-        String s = payPrice.multiply(new BigDecimal(100)).toString();
-        int i1 = Double.valueOf(s).intValue();
-        Object appOrder = mpWxPayService.createOrder(
-                "购买"+popularizeOrder.getTitle(),
-                "127.0.0.1",
-                orderId,
-                i1,
-                orderId,
-                hanHaiMember.getAppletOpenid(),
-                popularizeOrder.toString());
+//        //吊起微信支付
+//        String s = payPrice.multiply(new BigDecimal(100)).toString();
+//        int i1 = Double.valueOf(s).intValue();
+//        Object appOrder = mpWxPayService.createOrder(
+//                "购买"+popularizeOrder.getTitle(),
+//                "127.0.0.1",
+//                orderId,
+//                i1,
+//                orderId,
+//                hanHaiMember.getAppletOpenid(),
+//                popularizeOrder.toString());
 
-        return Result.OK("支付成功",appOrder);
+
+
+
+
+        return Result.OK("订单创建成功",popularizeOrder);
 
     }
 
@@ -810,6 +959,9 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 .lambdaQuery()
                 .eq(PopularizeOrder::getActivityOrderId, id)
                 .eq(PopularizeOrder::getUserId, hanHaiMember.getId())
+                //状态不等于0，3
+                .ne(PopularizeOrder::getState, "0")
+                .ne(PopularizeOrder::getState, "3")
                 .one();
         if(order!=null){
             return Result.error("已报名该活动,请不要重复报名！");
@@ -840,6 +992,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         //如果typePrice=0为早鸟价 1为单人价 2为尊享价
         if(typePrice==0){
             popularizeOrder.setPayPrice(byId.getBirdPrice());
+
             payPrice = byId.getBirdPrice();
         }else if(typePrice==1){
             popularizeOrder.setPayPrice(byId.getPersonPrice());
@@ -848,6 +1001,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
             popularizeOrder.setPayPrice(byId.getExpensivePrice());
             payPrice = byId.getExpensivePrice();
         }
+        popularizeOrder.setTypePrice(typePrice);
         popularizeOrder.setNum(1);
         popularizeOrder.setState("0");
         popularizeOrder.setCreateTime(new Date());
@@ -858,19 +1012,19 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         popularizeOrderService.save(popularizeOrder);
 
 
-        //吊起微信支付
-        String s = payPrice.multiply(new BigDecimal(100)).toString();
-        int i1 = Double.valueOf(s).intValue();
-        Object appOrder = mpWxPayService.createOrder(
-                "购买"+popularizeOrder.getTitle(),
-                "127.0.0.1",
-                orderId,
-                i1,
-                orderId,
-                hanHaiMember.getAppletOpenid(),
-                popularizeOrder.toString());
+//        //吊起微信支付
+//        String s = payPrice.multiply(new BigDecimal(100)).toString();
+//        int i1 = Double.valueOf(s).intValue();
+//        Object appOrder = mpWxPayService.createOrder(
+//                "购买"+popularizeOrder.getTitle(),
+//                "127.0.0.1",
+//                orderId,
+//                i1,
+//                orderId,
+//                hanHaiMember.getAppletOpenid(),
+//                popularizeOrder.toString());
 
-        return Result.OK("支付成功",appOrder);
+        return Result.OK("订单创建成功",popularizeOrder);
 
     }
 

module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/controller/PopularizeAuthenticationController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 主理人认证
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-15
  * @Version: V1.0
  */
 @Api(tags="主理人认证")

module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/entity/PopularizeAuthentication.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 主理人认证
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-15
  * @Version: V1.0
  */
 @Data
@@ -76,4 +76,12 @@ public class PopularizeAuthentication implements Serializable {
 	@Excel(name = "微信二维码", width = 15)
     @ApiModelProperty(value = "微信二维码")
     private java.lang.String img;
+	/**主理人分数*/
+	@Excel(name = "主理人分数", width = 15)
+    @ApiModelProperty(value = "主理人分数")
+    private java.lang.Integer num;
+	/**图片*/
+	@Excel(name = "图片", width = 15)
+    @ApiModelProperty(value = "图片")
+    private java.lang.String images;
 }

module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/mapper/PopularizeAuthenticationMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 主理人认证
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-15
  * @Version: V1.0
  */
 public interface PopularizeAuthenticationMapper extends BaseMapper<PopularizeAuthentication> {

module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/service/IPopularizeAuthenticationService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 主理人认证
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-15
  * @Version: V1.0
  */
 public interface IPopularizeAuthenticationService extends IService<PopularizeAuthentication> {

module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/service/impl/PopularizeAuthenticationServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 主理人认证
  * @Author: jeecg-boot
- * @Date:   2024-12-19
+ * @Date:   2025-01-15
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/PopularizeAuthenticationList.vue

@@ -162,7 +162,18 @@
           {
             title:'微信二维码',
             align:"center",
-            dataIndex: 'img'
+            dataIndex: 'img',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'主理人分数',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'图片',
+            align:"center",
+            dataIndex: 'images'
           },
           {
             title: '操作',
@@ -206,6 +217,8 @@
         fieldList.push({type:'int',value:'state',text:'状态',dictCode:'no_state_type'})
         fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         fieldList.push({type:'Text',value:'img',text:'微信二维码',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'主理人分数',dictCode:''})
+        fieldList.push({type:'Text',value:'images',text:'图片',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue/modules/PopularizeAuthenticationForm.vue

@@ -35,7 +35,17 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="微信二维码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="img">
-              <a-input v-model="model.img" placeholder="请输入微信二维码"  ></a-input>
+              <j-image-upload isMultiple  v-model="model.img" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="主理人分数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input-number v-model="model.num" placeholder="请输入主理人分数" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="images">
+              <a-input v-model="model.images" placeholder="请输入图片"  ></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>

module-common/src/main/java/org/jeecg/modules/popularizeAuthentication/vue3/PopularizeAuthentication.data.ts

@@ -44,7 +44,18 @@ export const columns: BasicColumn[] = [
    {
     title: '微信二维码',
     align:"center",
-    dataIndex: 'img'
+    dataIndex: 'img',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '主理人分数',
+    align:"center",
+    dataIndex: 'num'
+   },
+   {
+    title: '图片',
+    align:"center",
+    dataIndex: 'images'
    },
 ];
 //查询数据
@@ -90,6 +101,18 @@ export const formSchema: FormSchema[] = [
   {
     label: '微信二维码',
     field: 'img',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '主理人分数',
+    field: 'num',
+    component: 'InputNumber',
+  },
+  {
+    label: '图片',
+    field: 'images',
     component: 'Input',
   },
 ];

module-common/src/main/java/org/jeecg/modules/popularizeCollect/entity/PopularizeCollect.java

@@ -5,10 +5,13 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.popularizeActivity.entity.PopularizeActivity;
+import org.jeecg.modules.popularizeTravel.entity.PopularizeTravel;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -63,4 +66,10 @@ public class PopularizeCollect implements Serializable {
 	@Excel(name = "活动标题", width = 15)
     @ApiModelProperty(value = "活动标题")
     private java.lang.String activityId;
+
+
+    @TableField (exist = false)
+    private PopularizeTravel travelObject;
+    @TableField (exist = false)
+    private PopularizeActivity activityObject;
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-16
  * @Version: V1.0
  */
 @Api(tags="订单列表")

module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java

@@ -4,10 +4,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -23,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-16
  * @Version: V1.0
  */
 @Data
@@ -54,7 +51,7 @@ public class PopularizeOrder implements Serializable {
 	@Excel(name = "订单状态", width = 15, dicCode = "order_state")
 	@Dict(dicCode = "order_state")
     @ApiModelProperty(value = "订单状态")
-    private java.lang.String  state;
+    private java.lang.String state;
 	/**订单标题*/
 	@Excel(name = "订单标题", width = 15)
     @ApiModelProperty(value = "订单标题")
@@ -123,6 +120,8 @@ public class PopularizeOrder implements Serializable {
 	@Excel(name = "是否已评价", width = 15)
     @ApiModelProperty(value = "是否已评价")
     private java.lang.String isPj;
-
-
+	/**类型*/
+	@Excel(name = "类型", width = 15)
+    @ApiModelProperty(value = "类型")
+    private java.lang.Integer typePrice;
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-16
  * @Version: V1.0
  */
 public interface PopularizeOrderMapper extends BaseMapper<PopularizeOrder> {

module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-16
  * @Version: V1.0
  */
 public interface IPopularizeOrderService extends IService<PopularizeOrder> {

module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 订单列表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-16
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/PopularizeOrderList.vue

@@ -239,6 +239,11 @@
             dataIndex: 'isPj',
             customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isPj'], text) : ''),
           },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'typePrice'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -293,6 +298,7 @@
         fieldList.push({type:'int',value:'num',text:'购票数量',dictCode:''})
         fieldList.push({type:'switch',value:'isFp',text:'是否已开票'})
         fieldList.push({type:'switch',value:'isPj',text:'是否已评价'})
+        fieldList.push({type:'int',value:'typePrice',text:'类型',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue/modules/PopularizeOrderForm.vue

@@ -83,6 +83,11 @@
               <j-switch v-model="model.isPj"  ></j-switch>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typePrice">
+              <a-input-number v-model="model.typePrice" placeholder="请输入类型" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/popularizeOrder/vue3/PopularizeOrder.data.ts

@@ -100,6 +100,11 @@ export const columns: BasicColumn[] = [
        return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
      },
    },
+   {
+    title: '类型',
+    align:"center",
+    dataIndex: 'typePrice'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -236,4 +241,9 @@ export const formSchema: FormSchema[] = [
      componentProps:{
      },
   },
+  {
+    label: '类型',
+    field: 'typePrice',
+    component: 'InputNumber',
+  },
 ];

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/controller/PopularizeSignLogController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 签到记录表
  * @Author: jeecg-boot
- * @Date:   2024-12-23
+ * @Date:   2025-01-16
  * @Version: V1.0
  */
 @Api(tags="签到记录表")

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/entity/PopularizeSignLog.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 签到记录表
  * @Author: jeecg-boot
- * @Date:   2024-12-23
+ * @Date:   2025-01-16
  * @Version: V1.0
  */
 @Data
@@ -48,11 +48,33 @@ public class PopularizeSignLog implements Serializable {
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 	/**用户*/
-	@Excel(name = "用户", width = 15)
+	@Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "用户")
     private java.lang.String userId;
 	/**订单标识*/
-	@Excel(name = "订单标识", width = 15)
+	@Excel(name = "订单标识", width = 15, dictTable = "popularize_order", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "popularize_order", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "订单标识")
     private java.lang.String orderId;
+	/**票类型*/
+	@Excel(name = "票类型", width = 15)
+    @ApiModelProperty(value = "票类型")
+    private java.lang.Integer typeprice;
+	/**票数量*/
+	@Excel(name = "票数量", width = 15)
+    @ApiModelProperty(value = "票数量")
+    private java.lang.Integer num;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private java.lang.String name;
+	/**手机号码*/
+	@Excel(name = "手机号码", width = 15)
+    @ApiModelProperty(value = "手机号码")
+    private java.lang.String phone;
+	/**是否签到*/
+	@Excel(name = "是否签到", width = 15)
+    @ApiModelProperty(value = "是否签到")
+    private java.lang.Integer state;
 }

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 签到记录表
  * @Author: jeecg-boot
- * @Date:   2024-12-23
+ * @Date:   2025-01-16
  * @Version: V1.0
  */
 public interface PopularizeSignLogMapper extends BaseMapper<PopularizeSignLog> {

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/service/IPopularizeSignLogService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 签到记录表
  * @Author: jeecg-boot
- * @Date:   2024-12-23
+ * @Date:   2025-01-16
  * @Version: V1.0
  */
 public interface IPopularizeSignLogService extends IService<PopularizeSignLog> {

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/service/impl/PopularizeSignLogServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 签到记录表
  * @Author: jeecg-boot
- * @Date:   2024-12-23
+ * @Date:   2025-01-16
  * @Version: V1.0
  */
 @Service

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

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import PopularizeSignLogModal from './modules/PopularizeSignLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'PopularizeSignLogList',
@@ -124,12 +125,37 @@
           {
             title:'用户',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'订单标识',
             align:"center",
-            dataIndex: 'orderId'
+            dataIndex: 'orderId_dictText'
+          },
+          {
+            title:'票类型',
+            align:"center",
+            dataIndex: 'typeprice'
+          },
+          {
+            title:'票数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'手机号码',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'是否签到',
+            align:"center",
+            dataIndex: 'state'
           },
           {
             title: '操作',
@@ -165,8 +191,13 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
-        fieldList.push({type:'string',value:'orderId',text:'订单标识',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'orderId',text:'订单标识',dictTable:"popularize_order", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'int',value:'typeprice',text:'票类型',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'票数量',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
+        fieldList.push({type:'int',value:'state',text:'是否签到',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -5,12 +5,37 @@
         <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>
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </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>
+              <j-search-select-tag v-model="model.orderId" dict="popularize_order,title,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="票类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeprice">
+              <a-input-number v-model="model.typeprice" placeholder="请输入票类型" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="票数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input-number v-model="model.num" placeholder="请输入票数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入手机号码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否签到" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <a-input-number v-model="model.state" placeholder="请输入是否签到" style="width: 100%" />
             </a-form-model-item>
           </a-col>
         </a-row>

module-common/src/main/java/org/jeecg/modules/popularizeSignLog/vue3/PopularizeSignLog.data.ts

@@ -7,12 +7,37 @@ export const columns: BasicColumn[] = [
     {
     title: '用户',
     align:"center",
-    dataIndex: 'userId'
+    dataIndex: 'userId_dictText'
    },
    {
     title: '订单标识',
     align:"center",
-    dataIndex: 'orderId'
+    dataIndex: 'orderId_dictText'
+   },
+   {
+    title: '票类型',
+    align:"center",
+    dataIndex: 'typeprice'
+   },
+   {
+    title: '票数量',
+    align:"center",
+    dataIndex: 'num'
+   },
+   {
+    title: '姓名',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '手机号码',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '是否签到',
+    align:"center",
+    dataIndex: 'state'
    },
 ];
 //查询数据
@@ -23,11 +48,42 @@ export const formSchema: FormSchema[] = [
   {
     label: '用户',
     field: 'userId',
-    component: 'Input',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
   },
   {
     label: '订单标识',
     field: 'orderId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"popularize_order,title,id"
+    },
+  },
+  {
+    label: '票类型',
+    field: 'typeprice',
+    component: 'InputNumber',
+  },
+  {
+    label: '票数量',
+    field: 'num',
+    component: 'InputNumber',
+  },
+  {
+    label: '姓名',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '手机号码',
+    field: 'phone',
     component: 'Input',
   },
+  {
+    label: '是否签到',
+    field: 'state',
+    component: 'InputNumber',
+  },
 ];