修改

src/main/java/org/springblade/flow/activity/service/impl/AuditActivityService.java

@@ -66,7 +66,7 @@ public class AuditActivityService implements IAuditActivityService {
 			Kv variables = Kv.create()
 				.set("businessId",activity.getId())
 				.set("auditor", AuditCandidate.LDT_PLATFORM.name())
-				.set("mallTask", TaskUtil.getTaskUserForApp(Convert.toStr(activity.getLaunchId()),TaskUtil.APP_MALL))
+					.set("mallTask", TaskUtil.getTaskUserForApp(Convert.toStr(activity.getMallId()),TaskUtil.APP_MALL))
 				.set("toPlatform", toPlatform)
 				;
 

src/main/java/org/springblade/gateway/common_gateway/controller/AppActivityController.java

@@ -3,6 +3,9 @@ package org.springblade.gateway.common_gateway.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -44,6 +47,9 @@ public class AppActivityController {
 	private IActivityService activityService;
 	private IJoinRecordService joinRecordService;
 
+	public final static String MAP_URL = "https://apis.map.qq.com/ws/geocoder/v1/?location=";
+	public final static String MAP_KEY = "WAGBZ-EFIKU-2W2VF-4UX5F-ATB3F-HKBFU";
+
 	@PostMapping("publish")
 	public R publish(@RequestBody Activity activity) {
 		ProcessActivity processActivity = ProcessActivity.builder().activity(activity).build();
@@ -86,5 +92,15 @@ public class AppActivityController {
 		return R.data(ActivityWrapper.build().pageVO(pages));
 	}
 
+	@GetMapping("/getLocation")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "", notes = "传入rule")
+	public R getLocationData(String latitude,String longitude) {
+		String request_url = MAP_URL +latitude+","+longitude + "&key=" + MAP_KEY;
+		String s = HttpUtil.get(request_url);
+		JSONObject jsonObject = JSONUtil.parseObj(s);
+		return R.data(jsonObject);
+	}
+
 
 }

src/main/java/org/springblade/gateway/common_gateway/wrapper/AppJoinRecordWrapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.gateway.common_gateway.wrapper;
 
+import cn.hutool.core.lang.Assert;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.gateway.common_gateway.entity.vo.AppActivityVO;
@@ -52,6 +53,7 @@ public class AppJoinRecordWrapper extends BaseEntityWrapper<JoinRecord, AppActiv
 	public AppActivityVO entityVO(JoinRecord joinRecord) {
 		Long activityId = joinRecord.getActivityId();
 		Activity activity = activityService.getById(activityId);
+		Assert.notNull(activity, "找不到参加的活动信息");
 		AppActivityVO appActivityVO = Objects.requireNonNull(BeanUtil.copy(activity, AppActivityVO.class));
 		if (appActivityVO != null) {
 			appActivityVO.setJoinRecordId(joinRecord.getId());

src/main/java/org/springblade/gateway/mall_gateway/controller/AppMallController.java

@@ -9,13 +9,17 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.gateway.mall_gateway.entity.vo.AppMallVO;
 import org.springblade.gateway.mall_gateway.entity.vo.IndexStatisticVO;
 import org.springblade.gateway.mall_gateway.service.IAppMallService;
+import org.springblade.gateway.mall_gateway.wrapper.AppMallWrapper;
 import org.springblade.gateway.shop_gateway.entity.vo.MemberInfoVO;
+import org.springblade.ldt.activity.service.IActivityService;
 import org.springblade.ldt.mall.dto.MallDTO;
 import org.springblade.ldt.mall.entity.Mall;
 import org.springblade.ldt.mall.service.IMallService;
 import org.springblade.ldt.mall.vo.MallVO;
+import org.springblade.ldt.mall.wrapper.MallWrapper;
 import org.springblade.ldt.shop.entity.Shop;
 import org.springblade.ldt.user.entity.Member;
 import org.springblade.ldt.user.service.IMemberService;
@@ -35,6 +39,7 @@ public class AppMallController {
 	private IAppMallService appMallService;
 	private IMemberService memberService;
 	private IMallService mallService;
+	private IActivityService activityService;
 
 	@PostMapping("submit")
 	@ApiOperation(value = "商户提交审核")
@@ -43,6 +48,17 @@ public class AppMallController {
 		return R.status(true);
 	}
 
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入mall")
+	public R<IPage<AppMallVO>> list(Mall mall, Query query) {
+		IPage<Mall> pages = mallService.page(Condition.getPage(query), Condition.getQueryWrapper(mall));
+		return R.data(AppMallWrapper.build(activityService).pageVO(pages));
+	}
+
 	@GetMapping("statistic")
 	@ApiOperation(value = "获取商场统计数据")
 	public R statistic(String mallId) {

src/main/java/org/springblade/gateway/mall_gateway/entity/vo/AppMallVO.java

@@ -0,0 +1,40 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.gateway.mall_gateway.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.ldt.mall.entity.Mall;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "MallVO对象", description = "MallVO对象")
+public class AppMallVO extends Mall {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 该商场的活动数量
+	 */
+	private Integer activityNums;
+}

src/main/java/org/springblade/gateway/mall_gateway/wrapper/AppMallWrapper.java

@@ -0,0 +1,60 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.gateway.mall_gateway.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.gateway.mall_gateway.entity.vo.AppMallVO;
+import org.springblade.ldt.activity.entity.Activity;
+import org.springblade.ldt.activity.service.IActivityService;
+import org.springblade.ldt.mall.entity.Mall;
+import org.springblade.ldt.mall.vo.MallVO;
+
+import java.util.Objects;
+
+/**
+ * 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-09-06
+ */
+public class AppMallWrapper extends BaseEntityWrapper<Mall, AppMallVO>  {
+
+	private IActivityService activityService;
+
+	public AppMallWrapper(IActivityService activityService) {
+		this.activityService = activityService;
+	}
+
+	public static AppMallWrapper build(IActivityService activityService) {
+		return new AppMallWrapper(activityService);
+ 	}
+
+	@Override
+	public AppMallVO entityVO(Mall mall) {
+		AppMallVO appMallVO = Objects.requireNonNull(BeanUtil.copy(mall, AppMallVO.class));
+
+		if (appMallVO!=null) {
+			int count = activityService.count(Condition.getQueryWrapper(new Activity()).lambda().eq(Activity::getMallId, appMallVO.getId()));
+			appMallVO.setActivityNums(count);
+		}
+
+		return appMallVO;
+	}
+
+}

src/main/java/org/springblade/ldt/mall/controller/MallController.java

@@ -62,7 +62,7 @@ public class MallController extends BladeController {
 	}
 
 	/**
-	 * 分页 
+	 * 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -74,7 +74,7 @@ public class MallController extends BladeController {
 
 
 	/**
-	 * 自定义分页 
+	 * 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -85,7 +85,7 @@ public class MallController extends BladeController {
 	}
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -95,7 +95,7 @@ public class MallController extends BladeController {
 	}
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -105,7 +105,7 @@ public class MallController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -114,9 +114,9 @@ public class MallController extends BladeController {
 		return R.status(mallService.saveOrUpdate(mall));
 	}
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -125,5 +125,5 @@ public class MallController extends BladeController {
 		return R.status(mallService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

src/main/java/org/springblade/ldt/mall/wrapper/MallWrapper.java

@@ -18,6 +18,7 @@ package org.springblade.ldt.mall.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.ldt.activity.service.IActivityService;
 import org.springblade.ldt.mall.entity.Mall;
 import org.springblade.ldt.mall.vo.MallVO;
 import java.util.Objects;

src/main/java/org/springblade/ldt/shop/entity/Shop.java

@@ -198,6 +198,11 @@ public class Shop extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "定义多少金额赠送积分")
 		private BigDecimal sendPointUnit;
+	/**
+	* 评分
+	*/
+		@ApiModelProperty(value = "评分")
+		private BigDecimal score;
 
 
 }

src/main/java/org/springblade/ldt/shop/mapper/ShopMapper.xml

@@ -44,6 +44,7 @@
         <result column="address" property="address"/>
         <result column="activity_id" property="activityId"/>
         <result column="send_point_unit" property="sendPointUnit"/>
+        <result column="score" property="score"/>
     </resultMap>