交易处理

src/main/java/org/springblade/gateway/shop_gateway/controller/AppShopController.java

@@ -2,14 +2,18 @@ package org.springblade.gateway.shop_gateway.controller;
 
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
 import liquibase.pro.packaged.B;
 import lombok.SneakyThrows;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springblade.gateway.shop_gateway.entity.dto.ShopAuditDto;
 import org.springblade.gateway.shop_gateway.entity.vo.IndexVO;
+import org.springblade.gateway.shop_gateway.entity.vo.MemberInfoVO;
 import org.springblade.gateway.shop_gateway.service.IAppShopService;
 import org.springblade.ldt.bills.entity.Bills;
 import org.springblade.ldt.bills.service.IBillsService;
@@ -48,7 +52,7 @@ public class AppShopController {
 
 	@GetMapping("indexInfo")
 	@ApiOperation(value = "首页数据")
-	public R submitAudit(@RequestParam(value = "shopId") Long shopId) {
+	public R indexInfo(@RequestParam(value = "shopId") Long shopId) {
 
 		//今日新增会员数
 		int newMembers = memberService.getBaseMapper().selectCount(new QueryWrapper<Member>()
@@ -57,7 +61,7 @@ public class AppShopController {
 			.lt(Member::getCreateTime, DateUtil.beginOfDay(new Date()))
 		);
 		//店铺会员总数
-		int allMembers = memberService.getBaseMapper().selectCount(new QueryWrapper<Member>().lambda().eq(Member::getShopId,shopId));
+		int allMembers = getTotalMembers(shopId);
 
 		//店铺总资产
 		Shop shop = shopService.getById(shopId);
@@ -65,12 +69,10 @@ public class AppShopController {
 
 		//今日营收
 		QueryWrapper<Bills> queryWrapper = new QueryWrapper<>();
-
 		queryWrapper.select("IFNULL(sum(price),0) as todayCharge")
 			.lambda()
 			.eq(Bills::getReceiveId, shopId)
 			.lt(Bills::getCreateTime, DateUtil.beginOfDay(new Date()));
-
 		Map<String, Object> map = billsService.getMap(queryWrapper);
 		BigDecimal todayCharge = (BigDecimal) map.get("todayCharge");
 
@@ -83,4 +85,36 @@ public class AppShopController {
 			.build()
 		);
 	}
+
+	@GetMapping("memberInfo")
+	@ApiOperation(value = "会员中心数据")
+	public R memberInfo(@RequestParam(value = "shopId") Long shopId) {
+
+		//店铺会员总数
+		int allMembers = getTotalMembers(shopId);
+
+		//会员列表
+		IPage<Member> members = memberService.page(Condition.getPage(new Query()),
+			new QueryWrapper<Member>()
+			.lambda()
+			.eq(Member::getShopId,shopId)
+			.orderByDesc(Member::getCreateTime)
+		);
+
+		Shop shop = shopService.getById(shopId);
+
+
+		return R.data(MemberInfoVO
+			.builder()
+			.totalPointValue(shop.getTotalValue())
+			.pointUnitValue(shop.getPointRate())
+			.sendPointUnit(shop.getSendPointUnit())
+			.members(members)
+			.memberNum(allMembers)
+			.build());
+	}
+
+	private int getTotalMembers(Long shopId){
+		return memberService.getBaseMapper().selectCount(new QueryWrapper<Member>().lambda().eq(Member::getShopId,shopId));
+	}
 }

src/main/java/org/springblade/gateway/shop_gateway/entity/vo/MemberInfoVO.java

@@ -0,0 +1,29 @@
+package org.springblade.gateway.shop_gateway.entity.vo;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+import org.springblade.ldt.user.entity.Member;
+import java.math.BigDecimal;
+
+/**
+ * @author: lianghanqiang
+ * @description: 会员中心数据
+ * @since: 8/31/21 -- 3:39 PM
+ */
+@Data
+@Builder
+public class MemberInfoVO {
+
+	@ApiModelProperty("会员中心")
+	private Integer memberNum;
+	@ApiModelProperty("积分总价值")
+	private BigDecimal totalPointValue;
+	@ApiModelProperty("单元积分价值")
+	private BigDecimal pointUnitValue;
+	@ApiModelProperty("赠送积分单元价值")
+	private BigDecimal sendPointUnit;
+	@ApiModelProperty("会员列表")
+	private IPage<Member> members;
+}

src/main/java/org/springblade/payment/callback/UserPayCallback.java

@@ -62,7 +62,6 @@ public class UserPayCallback {
 
 
 	@EventListener
-	@Async
 	@Transactional
 	public void PaySuccess(UserPayEvent userPayEvent) {
 		SuccessParams successParams = userPayEvent.getSuccessParams();