修改

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

@@ -4,7 +4,6 @@ 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;
@@ -93,24 +92,15 @@ public class AppShopController {
 		//店铺会员总数
 		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)
+			.isOpenMember(shop.getIsOpenMember())
 			.build());
 	}
 

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

@@ -24,6 +24,6 @@ public class MemberInfoVO {
 	private BigDecimal pointUnitValue;
 	@ApiModelProperty("赠送积分单元价值")
 	private BigDecimal sendPointUnit;
-	@ApiModelProperty("会员列表")
-	private IPage<Member> members;
+	@ApiModelProperty("是否开启会员中心 0未开启 1已开启")
+	private Integer isOpenMember;
 }

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

@@ -109,12 +109,17 @@ public class UserPayCallback {
 
 			paymentVO.setIsSuccess(Boolean.TRUE);
 			paymentVO.setMsg("交易成功！");
-			paymentVO.setSuccessParams(successParams);
+			paymentVO.setTotalPrice(successParams.getTotalPrice());
 
 		} catch (Exception e) {
 			log.error(e.getMessage());
 			throw new ServiceException(ResCode.TRADE_ERROR);
 		} finally {
+			webSocketServer.sendInfo(
+				AppConstant.SOCKET_PRE.USER.getName()+successParams.getUserId(),
+				JSON.toJSONString(paymentVO)
+			);
+
 			webSocketServer.sendInfo(
 				AppConstant.SOCKET_PRE.SHOP.getName()+successParams.getShopId(),
 				JSON.toJSONString(paymentVO)

src/main/java/org/springblade/payment/entity/PaymentVO.java

@@ -3,6 +3,8 @@ package org.springblade.payment.entity;
 import lombok.Builder;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author: lianghanqiang
  * @description:
@@ -13,5 +15,5 @@ import lombok.Data;
 public class PaymentVO {
 	Boolean isSuccess;
 	String msg;
-	SuccessParams successParams;
+	BigDecimal totalPrice;
 }

src/main/java/org/springblade/payment/handle/handler/WxPayHandle.java

@@ -2,6 +2,7 @@ package org.springblade.payment.handle.handler;
 
 import com.alibaba.fastjson.JSON;
 import lombok.AllArgsConstructor;
+import org.springblade.common.enums.AppConstant;
 import org.springblade.common.enums.PaymentScene;
 import org.springblade.common.enums.ResCode;
 import org.springblade.core.log.exception.ServiceException;
@@ -36,7 +37,7 @@ public class WxPayHandle implements BaseHandle {
 		bills.setPrice(remain);
 
 		//通知用户调起支付
-		webSocketServer.sendInfo(order.getLoginUser().getId().toString(), JSON.toJSONString(bills));
+		webSocketServer.sendInfo(AppConstant.SOCKET_PRE.USER.getName()+order.getLoginUser().getId().toString(), JSON.toJSONString(bills));
 		Assert.isTrue(billsService.saveOrUpdate(bills),()->{ throw new ServiceException(ResCode.INIT_ORDER_FAIL) ;});
 		return HandleData.builder().isSuccess(Boolean.TRUE).successParams(successParams).remain(remain).build();
 	}

src/main/java/org/springblade/point/listener/SendPointHandle.java

@@ -1,6 +1,7 @@
 package org.springblade.point.listener;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.ResCode;
@@ -30,6 +31,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Objects;
 
@@ -40,6 +42,7 @@ import java.util.Objects;
  */
 @Component
 @Slf4j
+@AllArgsConstructor
 public class SendPointHandle  {
 	private ILoginUserService loginUserService;
 	private IBalanceBillsService balanceBillsService;
@@ -49,10 +52,9 @@ public class SendPointHandle  {
 	private IUserChannelPointService userChannelPointService;
 	private IBillsService billsService;
 	private IMemberService memberService;
-	
+
 	@EventListener
 	@Transactional
-	@Async
 	public void handleSendPoint(BillSuccessEvent billSuccessEvent){
 		SuccessParams successParams = billSuccessEvent.getSuccessParams();
 		Bills bill = successParams.getBills();