day16

   支付异步回调；分布式任务调度

model/src/main/java/com/atguigu/tingshu/vo/account/RechargeInfoVo.java

@@ -2,6 +2,7 @@ package com.atguigu.tingshu.vo.account;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.hibernate.validator.constraints.Range;
 
 import java.math.BigDecimal;
 
@@ -9,10 +10,11 @@ import java.math.BigDecimal;
 @Schema(description = "充值对象")
 public class RechargeInfoVo {
 
-	@Schema(description = "充值金额")
-	private BigDecimal amount;
+    @Schema(description = "充值金额")
+    @Range(min = 1, max = 999, message = "受监管充值金额1~999之间")
+    private BigDecimal amount;
 
-	@Schema(description = "支付方式：1101-微信 1102-支付宝")
-	private String payWay;
+    @Schema(description = "支付方式：1101-微信 1102-支付宝")
+    private String payWay;
 
-}
+}

pom.xml

@@ -34,7 +34,7 @@
         <vod_api.version>2.1.4</vod_api.version>
         <minio.version>8.2.0</minio.version>
         <jodatime.version>2.10.1</jodatime.version>
-        <xxl-job.version>2.4.0</xxl-job.version>
+        <xxl-job.version>3.0.0</xxl-job.version>
         <wxpay.version>0.0.3</wxpay.version>
         <redisson.version>3.20.0</redisson.version>
         <guava.version>23.0</guava.version>

service-client/service-account-client/src/main/java/com/atguigu/tingshu/account/AccountFeignClient.java

@@ -36,4 +36,12 @@ public interface AccountFeignClient {
      */
     @GetMapping("/rechargeInfo/getRechargeInfo/{orderNo}")
     public Result<RechargeInfo> getRechargeInfo(@PathVariable("orderNo") String orderNo);
+
+    /**
+     * 	用户付款成功后，完成充值业务
+     * @param orderNo
+     * @return
+     */
+    @GetMapping("/rechargeInfo/rechargePaySuccess/{orderNo}")
+    public Result rechargePaySuccess(@PathVariable("orderNo") String orderNo);
 }

service-client/service-account-client/src/main/java/com/atguigu/tingshu/account/impl/AccountDegradeFeignClient.java

@@ -23,4 +23,10 @@ public class AccountDegradeFeignClient implements AccountFeignClient {
         log.error("[账户服务]提供远程调用方法：{}，执行服务降级", "getRechargeInfo");
         return null;
     }
+
+    @Override
+    public Result rechargePaySuccess(String orderNo) {
+        log.error("[账户服务]提供远程调用方法：{}，执行服务降级", "rechargePaySuccess");
+        return null;
+    }
 }

service-client/service-order-client/src/main/java/com/atguigu/tingshu/order/client/OrderFeignClient.java

@@ -26,4 +26,14 @@ public interface OrderFeignClient {
     @GetMapping("/orderInfo/getOrderInfo/{orderNo}")
     public Result<OrderInfo> getOrderInfo(@PathVariable("orderNo") String orderNo);
 
+
+    /**
+     * 用户付款成功后更新订单状态以及虚拟物品发货
+     *
+     * @param orderNo
+     * @return
+     */
+    @GetMapping("/orderInfo/orderPaySuccess/{orderNo}")
+    public Result orderPaySuccess(@PathVariable("orderNo") String orderNo);
+
 }

service-client/service-order-client/src/main/java/com/atguigu/tingshu/order/client/impl/OrderDegradeFeignClient.java

@@ -13,4 +13,9 @@ public class OrderDegradeFeignClient implements OrderFeignClient {
     public Result<OrderInfo> getOrderInfo(String orderNo) {
         return null;
     }
+
+    @Override
+    public Result orderPaySuccess(String orderNo) {
+        return null;
+    }
 }

service-client/service-search-client/src/main/java/com/atguigu/tingshu/search/client/SearchFeignClient.java

@@ -1,7 +1,9 @@
 package com.atguigu.tingshu.search.client;
 
+import com.atguigu.tingshu.common.result.Result;
 import com.atguigu.tingshu.search.client.impl.SearchDegradeFeignClient;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 
 /**
  * <p>
@@ -10,8 +12,17 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author atguigu
  */
-@FeignClient(value = "service-search", fallback = SearchDegradeFeignClient.class)
+@FeignClient(value = "service-search",path = "api/search", fallback = SearchDegradeFeignClient.class)
 public interface SearchFeignClient {
 
 
+
+    /**
+     * 手动更新Redis中小时榜数据
+     * @return
+     */
+    @GetMapping("/albumInfo/updateLatelyAlbumRanking")
+    public Result updateLatelyAlbumRanking();
+
+
 }

service-client/service-search-client/src/main/java/com/atguigu/tingshu/search/client/impl/SearchDegradeFeignClient.java

@@ -1,5 +1,6 @@
 package com.atguigu.tingshu.search.client.impl;
 
+import com.atguigu.tingshu.common.result.Result;
 import com.atguigu.tingshu.search.client.SearchFeignClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -12,4 +13,8 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class SearchDegradeFeignClient implements SearchFeignClient {
+    @Override
+    public Result updateLatelyAlbumRanking() {
+        return null;
+    }
 }

service-client/service-user-client/src/main/java/com/atguigu/tingshu/user/client/UserFeignClient.java

@@ -71,4 +71,12 @@ public interface UserFeignClient {
 
     @PostMapping("/userInfo/savePaidRecord")
     public Result savePaidRecord(@RequestBody UserPaidRecordVo userPaidRecordVo);
+
+
+    /**
+     * 更新VIP状态：处理过期会员
+     * @return
+     */
+    @GetMapping("/updateVipExpireStatus")
+    public Result updateVipExpireStatus();
 }

service-client/service-user-client/src/main/java/com/atguigu/tingshu/user/client/impl/UserDegradeFeignClient.java

@@ -51,4 +51,10 @@ public class UserDegradeFeignClient implements UserFeignClient {
         log.error("[用户服务]提供远程{}调用执行服务降级", "savePaidRecord");
         return null;
     }
+
+    @Override
+    public Result updateVipExpireStatus() {
+        log.error("[用户服务]提供远程{}调用执行服务降级", "updateVipExpireStatus");
+        return null;
+    }
 }

service/service-account/src/main/java/com/atguigu/tingshu/account/api/RechargeInfoApiController.java

@@ -1,15 +1,17 @@
 package com.atguigu.tingshu.account.api;
 
 import com.atguigu.tingshu.account.service.RechargeInfoService;
+import com.atguigu.tingshu.common.login.GuiGuLogin;
 import com.atguigu.tingshu.common.result.Result;
 import com.atguigu.tingshu.model.account.RechargeInfo;
+import com.atguigu.tingshu.vo.account.RechargeInfoVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 @Tag(name = "充值管理")
 @RestController
@@ -34,5 +36,31 @@ public class RechargeInfoApiController {
 	}
 
 
+	/**
+	 * 保存充值记录
+	 * @param rechargeInfoVo
+	 * @return {orderNo：“充值订单编号”} 对接拉起微信支付参数接口
+	 */
+	@GuiGuLogin
+	@Operation(summary = "提交充值")
+	@PostMapping("/rechargeInfo/submitRecharge")
+	public Result<Map<String, String>> submitRecharge(@RequestBody @Validated RechargeInfoVo rechargeInfoVo){
+		Map<String, String> map = rechargeInfoService.submitRecharge(rechargeInfoVo);
+		return Result.ok(map);
+	}
+
+
+	/**
+	 * 	用户付款成功后，完成充值业务
+	 * @param orderNo
+	 * @return
+	 */
+	@Operation(summary = "用户付款成功后，完成充值业务")
+	@GetMapping("/rechargeInfo/rechargePaySuccess/{orderNo}")
+	public Result rechargePaySuccess(@PathVariable("orderNo") String orderNo){
+		rechargeInfoService.rechargePaySuccess(orderNo);
+		return Result.ok();
+	}
+
 }
 

service/service-account/src/main/java/com/atguigu/tingshu/account/api/UserAccountApiController.java

@@ -1,10 +1,13 @@
 package com.atguigu.tingshu.account.api;
 
 import com.atguigu.tingshu.account.service.UserAccountService;
+import com.atguigu.tingshu.common.constant.SystemConstant;
 import com.atguigu.tingshu.common.login.GuiGuLogin;
 import com.atguigu.tingshu.common.result.Result;
 import com.atguigu.tingshu.common.util.AuthContextHolder;
+import com.atguigu.tingshu.model.account.UserAccountDetail;
 import com.atguigu.tingshu.vo.account.AccountDeductVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,34 +21,73 @@ import java.math.BigDecimal;
 @SuppressWarnings({"all"})
 public class UserAccountApiController {
 
-	@Autowired
-	private UserAccountService userAccountService;
-
-	/**
-	 * 获取用户账户可用余额
-	 * @return
-	 */
-	@GuiGuLogin
-	@GetMapping("/userAccount/getAvailableAmount")
-	public Result<BigDecimal> getAvailableAmount() {
-		//1.获取当前用户ID
-		Long userId = AuthContextHolder.getUserId();
-		//2.获取指定用户账户可用余额
-		BigDecimal availableAmount = userAccountService.getAvailableAmount(userId);
-		return Result.ok(availableAmount);
-	}
-
-
-	/**
-	 * 检查扣减账户余额
-	 * @param accountDeductVo
-	 * @return
-	 */
-	@Operation(summary = "检查扣减账户余额")
-	@PostMapping("/userAccount/checkAndDeduct")
-	public Result checkAndDeduct(@RequestBody AccountDeductVo accountDeductVo){
-		userAccountService.checkAndDeduct(accountDeductVo);
-		return Result.ok();
-	}
+    @Autowired
+    private UserAccountService userAccountService;
+
+    /**
+     * 获取用户账户可用余额
+     *
+     * @return
+     */
+    @GuiGuLogin
+    @GetMapping("/userAccount/getAvailableAmount")
+    public Result<BigDecimal> getAvailableAmount() {
+        //1.获取当前用户ID
+        Long userId = AuthContextHolder.getUserId();
+        //2.获取指定用户账户可用余额
+        BigDecimal availableAmount = userAccountService.getAvailableAmount(userId);
+        return Result.ok(availableAmount);
+    }
+
+
+    /**
+     * 检查扣减账户余额
+     *
+     * @param accountDeductVo
+     * @return
+     */
+    @Operation(summary = "检查扣减账户余额")
+    @PostMapping("/userAccount/checkAndDeduct")
+    public Result checkAndDeduct(@RequestBody AccountDeductVo accountDeductVo) {
+        userAccountService.checkAndDeduct(accountDeductVo);
+        return Result.ok();
+    }
+
+
+    /**
+     * 查询用户充值记录
+     *
+     * @param page
+     * @param limit
+     * @return
+     */
+    @GuiGuLogin
+    @Operation(summary = "查询用户充值记录")
+    @GetMapping("/userAccount/findUserRechargePage/{page}/{limit}")
+    public Result<Page<UserAccountDetail>> getUserRechargePage(@PathVariable int page, @PathVariable int limit) {
+        Long userId = AuthContextHolder.getUserId();
+        Page<UserAccountDetail> pageInfo = new Page<>(page, limit);
+        userAccountService.findUserAccountDetailByPage(pageInfo, userId, SystemConstant.ACCOUNT_TRADE_TYPE_DEPOSIT);
+        return Result.ok(pageInfo);
+    }
+
+
+
+    /**
+     * 查询用户消费记录
+     *
+     * @param page
+     * @param limit
+     * @return
+     */
+    @GuiGuLogin
+    @Operation(summary = "查询用户消费记录")
+    @GetMapping("/userAccount/findUserConsumePage/{page}/{limit}")
+    public Result<Page<UserAccountDetail>> getUserConsumePage(@PathVariable int page, @PathVariable int limit) {
+        Long userId = AuthContextHolder.getUserId();
+        Page<UserAccountDetail> pageInfo = new Page<>(page, limit);
+        userAccountService.findUserAccountDetailByPage(pageInfo, userId, SystemConstant.ACCOUNT_TRADE_TYPE_MINUS);
+        return Result.ok(pageInfo);
+    }
 }
 

service/service-account/src/main/java/com/atguigu/tingshu/account/mapper/RechargeInfoMapper.java

@@ -3,9 +3,18 @@ package com.atguigu.tingshu.account.mapper;
 import com.atguigu.tingshu.model.account.RechargeInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface RechargeInfoMapper extends BaseMapper<RechargeInfo> {
 
 
+    /**
+     * 更新充值记录
+     * @param orderNo 订单编号
+     * @param orderStatusCondition 期望充值状态
+     * @param orderStatus 更新充值状态
+     * @return
+     */
+    int updateRechageStatus(@Param("orderNo") String orderNo,@Param("orderStatusCondition") String orderStatusCondition, @Param("orderStatus") String orderStatus);
 }

service/service-account/src/main/java/com/atguigu/tingshu/account/service/RechargeInfoService.java

@@ -1,8 +1,11 @@
 package com.atguigu.tingshu.account.service;
 
 import com.atguigu.tingshu.model.account.RechargeInfo;
+import com.atguigu.tingshu.vo.account.RechargeInfoVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 public interface RechargeInfoService extends IService<RechargeInfo> {
 
     /**
@@ -11,4 +14,18 @@ public interface RechargeInfoService extends IService<RechargeInfo> {
      * @return
      */
     RechargeInfo getRechargeInfo(String orderNo);
+
+    /**
+     * 保存充值记录
+     * @param rechargeInfoVo
+     * @return {orderNo：“充值订单编号”}
+     */
+    Map<String, String> submitRecharge(RechargeInfoVo rechargeInfoVo);
+
+    /**
+     * 	用户付款成功后，完成充值业务
+     * @param orderNo
+     * @return
+     */
+    void rechargePaySuccess(String orderNo);
 }

service/service-account/src/main/java/com/atguigu/tingshu/account/service/UserAccountService.java

@@ -1,7 +1,9 @@
 package com.atguigu.tingshu.account.service;
 
 import com.atguigu.tingshu.model.account.UserAccount;
+import com.atguigu.tingshu.model.account.UserAccountDetail;
 import com.atguigu.tingshu.vo.account.AccountDeductVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.math.BigDecimal;
@@ -41,4 +43,14 @@ public interface UserAccountService extends IService<UserAccount> {
      * @return
      */
     void checkAndDeduct(AccountDeductVo accountDeductVo);
+
+
+    /**
+     *  分页查询用户消费、充值记录
+     * @param pageInfo 分页对象
+     * @param userId 用户ID
+     * @param tradeType 交易类型：1201-充值 1202-锁定 1203-解锁 1204-消费
+     * @return
+     */
+    Page<UserAccountDetail> findUserAccountDetailByPage(Page<UserAccountDetail> pageInfo, Long userId, String tradeType);
 }

service/service-account/src/main/java/com/atguigu/tingshu/account/service/impl/RechargeInfoServiceImpl.java

@@ -1,29 +1,102 @@
 package com.atguigu.tingshu.account.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.atguigu.tingshu.account.mapper.RechargeInfoMapper;
 import com.atguigu.tingshu.account.service.RechargeInfoService;
+import com.atguigu.tingshu.account.service.UserAccountService;
+import com.atguigu.tingshu.common.constant.SystemConstant;
+import com.atguigu.tingshu.common.execption.GuiguException;
+import com.atguigu.tingshu.common.util.AuthContextHolder;
 import com.atguigu.tingshu.model.account.RechargeInfo;
+import com.atguigu.tingshu.model.account.UserAccount;
+import com.atguigu.tingshu.vo.account.RechargeInfoVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Service
 @SuppressWarnings({"all"})
 public class RechargeInfoServiceImpl extends ServiceImpl<RechargeInfoMapper, RechargeInfo> implements RechargeInfoService {
 
-	@Autowired
-	private RechargeInfoMapper rechargeInfoMapper;
-
-	/**
-	 * 根据充值订单编号查询充值记录
-	 * @param orderNo
-	 * @return
-	 */
-	@Override
-	public RechargeInfo getRechargeInfo(String orderNo) {
-		LambdaQueryWrapper<RechargeInfo> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.eq(RechargeInfo::getOrderNo, orderNo);
-		return baseMapper.selectOne(queryWrapper);
-	}
+    @Autowired
+    private RechargeInfoMapper rechargeInfoMapper;
+
+    @Autowired
+    private UserAccountService userAccountService;
+
+    /**
+     * 根据充值订单编号查询充值记录
+     *
+     * @param orderNo
+     * @return
+     */
+    @Override
+    public RechargeInfo getRechargeInfo(String orderNo) {
+        LambdaQueryWrapper<RechargeInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(RechargeInfo::getOrderNo, orderNo);
+        return baseMapper.selectOne(queryWrapper);
+    }
+
+    /**
+     * 保存充值记录
+     *
+     * @param rechargeInfoVo
+     * @return
+     */
+    @Override
+    public Map<String, String> submitRecharge(RechargeInfoVo rechargeInfoVo) {
+        //1.构建充值记录对象
+        RechargeInfo rechargeInfo = new RechargeInfo();
+        rechargeInfo.setUserId(AuthContextHolder.getUserId());
+        //1.1 生成充值订单编号 形式：CZ+日期+雪花算法
+        String orderNo = "CZ" + DateUtil.today().replaceAll("-", "") + IdWorker.getIdStr();
+        rechargeInfo.setOrderNo(orderNo);
+        rechargeInfo.setRechargeStatus(SystemConstant.ORDER_STATUS_UNPAID);
+        rechargeInfo.setRechargeAmount(rechargeInfoVo.getAmount());
+        rechargeInfo.setPayWay(rechargeInfoVo.getPayWay());
+        //2.保存充值记录
+        baseMapper.insert(rechargeInfo);
+        //3.封装订单编号
+        Map<String, String> map = new HashMap<>();
+        map.put("orderNo", orderNo);
+
+        //4.TODO 发送延迟消息，延迟关闭充值记录
+        return map;
+    }
+
+    /**
+     * 用户付款成功后，完成充值业务
+     *
+     * @param orderNo
+     * @return
+     */
+    @Override
+    public void rechargePaySuccess(String orderNo) {
+        //1.更新充值记录状态，避免先执行延迟关单，再用户付款 采用乐观锁更新  更新失败：发起退款流程
+        int count = baseMapper.updateRechageStatus(orderNo, SystemConstant.ORDER_STATUS_UNPAID, SystemConstant.ORDER_STATUS_PAID);
+        if (count == 0) {
+            //TODO 更新失败，调用支付服务-发起退款流程
+            throw new GuiguException(500, "更新充值（已支付）失败:" + orderNo);
+        }
+        //2.余额充值
+        RechargeInfo rechargeInfo = this.getRechargeInfo(orderNo);
+        boolean flag = userAccountService.update(null,
+                new LambdaUpdateWrapper<UserAccount>()
+                        .eq(UserAccount::getUserId, rechargeInfo.getUserId())
+                        .setSql("total_amount = total_amount + " + rechargeInfo.getRechargeAmount())
+                        .setSql("available_amount = available_amount + " + rechargeInfo.getRechargeAmount())
+                        .setSql("total_income_amount = total_income_amount + " + rechargeInfo.getRechargeAmount())
+        );
+        if (!flag) {
+            throw new GuiguException(500, "充值失败");
+        }
+        //3.新增账户变动日志
+        userAccountService.saveUserAccountDetail(rechargeInfo.getUserId(), "充值", SystemConstant.ACCOUNT_TRADE_TYPE_DEPOSIT, rechargeInfo.getRechargeAmount(), orderNo);
+    }
 }

service/service-account/src/main/java/com/atguigu/tingshu/account/service/impl/UserAccountServiceImpl.java

@@ -11,6 +11,7 @@ import com.atguigu.tingshu.model.account.UserAccountDetail;
 import com.atguigu.tingshu.vo.account.AccountDeductVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -113,4 +114,22 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountMapper, UserA
         //2.记录账户变动日志
         this.saveUserAccountDetail(accountDeductVo.getUserId(), accountDeductVo.getContent(), SystemConstant.ACCOUNT_TRADE_TYPE_MINUS, accountDeductVo.getAmount(), accountDeductVo.getOrderNo());
     }
+
+    /**
+     *  分页查询用户消费、充值记录
+     * @param pageInfo 分页对象
+     * @param userId 用户ID
+     * @param tradeType 交易类型：1201-充值 1202-锁定 1203-解锁 1204-消费
+     * @return
+     */
+    @Override
+    public Page<UserAccountDetail> findUserAccountDetailByPage(Page<UserAccountDetail> pageInfo, Long userId, String tradeType) {
+        //1.构建查询条件
+        LambdaQueryWrapper<UserAccountDetail> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserAccountDetail::getUserId, userId);
+        queryWrapper.eq(UserAccountDetail::getTradeType, tradeType);
+        queryWrapper.orderByDesc(UserAccountDetail::getId);
+        //2.执行分页
+        return userAccountDetailMapper.selectPage(pageInfo, queryWrapper);
+    }
 }

service/service-account/src/main/resources/mapper/RechargeInfoMapper.xml

@@ -0,0 +1,13 @@
+<?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="com.atguigu.tingshu.account.mapper.RechargeInfoMapper">
+
+
+	<update id="updateRechageStatus">
+		UPDATE recharge_info set recharge_status = #{orderStatus}
+		where order_no = #{orderNo} and recharge_status = #{orderStatusCondition}
+	</update>
+</mapper>
+

service/service-album/src/main/java/com/atguigu/tingshu/album/task/ReviewTask.java

@@ -59,8 +59,6 @@ public class ReviewTask {
                     trackInfoMapper.updateById(trackInfo);
                 }
             }
-
-
         }
     }
 }

service/service-album/src/test/java/com/atguigu/tingshu/ServiceAlbumApplicationTest.java

@@ -8,9 +8,8 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.io.IOException;
+import java.util.concurrent.*;
 
 @SpringBootTest
 class ServiceAlbumApplicationTest {
@@ -48,13 +47,21 @@ class ServiceAlbumApplicationTest {
     }
 
     @Test
-    public void test() {
+    public void test() throws IOException {
         //List<AlbumInfo> list = albumInfoMapper.selectList(null);
         //System.out.println(list);
 
         //List<BaseCategoryView> selectList = baseCategoryViewMapper.selectList(null);
         //System.out.println(selectList);
         //System.out.println(baseCategoryViewMapper.selectById(1L));
+
+        ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(5);
+        scheduledExecutorService.scheduleWithFixedDelay(()->{
+            System.out.println("定时任务执行了");
+        }, 5, 1, TimeUnit.SECONDS);
+
+
+        System.in.read();
     }
 
 }

service/service-dispatch/src/main/java/com/atguigu/tingshu/dispatch/config/XxlJobConfig.java

@@ -0,0 +1,82 @@
+package com.atguigu.tingshu.dispatch.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+@Configuration
+public class XxlJobConfig {
+    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+    @Value("${xxl.job.admin.addresses}")
+    private String adminAddresses;
+
+    @Value("${xxl.job.admin.accessToken}")
+    private String accessToken;
+
+    @Value("${xxl.job.admin.timeout}")
+    private int timeout;
+
+    @Value("${xxl.job.executor.appname}")
+    private String appname;
+
+    @Value("${xxl.job.executor.address}")
+    private String address;
+
+    @Value("${xxl.job.executor.ip}")
+    private String ip;
+
+    @Value("${xxl.job.executor.port}")
+    private int port;
+
+    @Value("${xxl.job.executor.logpath}")
+    private String logPath;
+
+    @Value("${xxl.job.executor.logretentiondays}")
+    private int logRetentionDays;
+
+
+    @Bean
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        logger.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppname(appname);
+        xxlJobSpringExecutor.setAddress(address);
+        xxlJobSpringExecutor.setIp(ip);
+        xxlJobSpringExecutor.setPort(port);
+        xxlJobSpringExecutor.setAccessToken(accessToken);
+        xxlJobSpringExecutor.setTimeout(timeout);
+        xxlJobSpringExecutor.setLogPath(logPath);
+        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+        return xxlJobSpringExecutor;
+    }
+
+    /**
+     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+     *
+     *      1、引入依赖：
+     *          <dependency>
+     *             <groupId>org.springframework.cloud</groupId>
+     *             <artifactId>spring-cloud-commons</artifactId>
+     *             <version>${version}</version>
+     *         </dependency>
+     *
+     *      2、配置文件，或者容器启动变量
+     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+     *
+     *      3、获取IP
+     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+     */
+
+
+}

service/service-dispatch/src/main/java/com/atguigu/tingshu/dispatch/job/DispatchHandler.java

@@ -1,10 +1,39 @@
 package com.atguigu.tingshu.dispatch.job;
 
+import com.atguigu.tingshu.search.client.SearchFeignClient;
+import com.atguigu.tingshu.user.client.UserFeignClient;
+import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component
 public class DispatchHandler {
 
-}
+    @Autowired
+    private SearchFeignClient searchFeignClient;
+
+    @Autowired
+    private UserFeignClient userFeignClient;
+
+    /**
+     * 更新Redis中小时榜任务
+     */
+    @XxlJob("updateLatelyAlbumRanking")
+    public void updateLatelyAlbumRanking() {
+        log.info("更新Redis中小时榜任务.");
+        searchFeignClient.updateLatelyAlbumRanking();
+    }
+
+
+    /**
+     * 更新VIP会员标识
+     */
+    @XxlJob("updateVipExpireStatus")
+    public void updateVipExpireStatus() {
+        log.info("更新VIP会员标识任务.");
+        userFeignClient.updateVipExpireStatus();
+    }
+
+}

service/service-dispatch/src/main/resources/bootstrap.properties

@@ -6,3 +6,34 @@ spring.cloud.nacos.config.server-addr=192.168.200.6:8848
 spring.cloud.nacos.config.prefix=${spring.application.name}
 spring.cloud.nacos.config.file-extension=yaml
 spring.cloud.nacos.config.shared-configs[0].data-id=common.yaml
+server.port=8509
+
+
+
+
+# no web
+#spring.main.web-environment=false
+
+# log config
+logging.config=classpath:logback.xml
+
+
+### TODO 调度中心注册地址
+xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
+### xxl-job, access token
+xxl.job.admin.accessToken=default_token
+### xxl-job timeout by second, default 3s
+xxl.job.admin.timeout=3
+
+### TODO 执行器名称，同一个执行器集群后名称一样
+xxl.job.executor.appname=service-dispatch
+### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
+xxl.job.executor.address=
+### xxl-job executor server-info
+xxl.job.executor.ip=
+xxl.job.executor.port=9999
+### xxl-job executor log-path
+xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
+### xxl-job executor log-retention-days
+xxl.job.executor.logretentiondays=30
+

service/service-order/src/main/java/com/atguigu/tingshu/order/api/OrderInfoApiController.java

@@ -23,77 +23,95 @@ import java.util.Map;
 @SuppressWarnings({"all"})
 public class OrderInfoApiController {
 
-	@Autowired
-	private OrderInfoService orderInfoService;
+    @Autowired
+    private OrderInfoService orderInfoService;
 
 
-	/**
-	 * 对购买商品（VIP会员、专辑、声音）进行结算，渲染结算页
-	 * @param tradeVo
-	 * @return
-	 */
-	@GuiGuLogin
-	@Operation(summary = "对购买商品（VIP会员、专辑、声音）进行结算，渲染结算页")
-	@PostMapping("/orderInfo/trade")
-	public Result<OrderInfoVo> trade(@RequestBody @Validated TradeVo tradeVo) {
-		//1.获取用户ID
-		Long userId = AuthContextHolder.getUserId();
-		//2.调用业务逻辑处理不同商品类别结算页数据
-		OrderInfoVo orderInfoVo = orderInfoService.trade(userId, tradeVo);
-		return Result.ok(orderInfoVo);
-	}
+    /**
+     * 对购买商品（VIP会员、专辑、声音）进行结算，渲染结算页
+     *
+     * @param tradeVo
+     * @return
+     */
+    @GuiGuLogin
+    @Operation(summary = "对购买商品（VIP会员、专辑、声音）进行结算，渲染结算页")
+    @PostMapping("/orderInfo/trade")
+    public Result<OrderInfoVo> trade(@RequestBody @Validated TradeVo tradeVo) {
+        //1.获取用户ID
+        Long userId = AuthContextHolder.getUserId();
+        //2.调用业务逻辑处理不同商品类别结算页数据
+        OrderInfoVo orderInfoVo = orderInfoService.trade(userId, tradeVo);
+        return Result.ok(orderInfoVo);
+    }
 
 
-	/**
-	 * 提交订单
-	 * @param orderInfoVo
-	 * @return
-	 */
-	@GuiGuLogin
-	@Operation(summary = "提交订单")
-	@PostMapping("/orderInfo/submitOrder")
-	public Result<Map<String, String>> submitOrder(@RequestBody @Validated OrderInfoVo orderInfoVo) {
-		//1.获取用户ID
-		Long userId = AuthContextHolder.getUserId();
-		//2.调用业务逻辑处理订单提交
-		String orderNo = orderInfoService.submitOrder(userId, orderInfoVo);
-		//3.返回对象封装订单编号
-		Map<String, String> map = new HashMap<>();
-		map.put("orderNo", orderNo);
-		return Result.ok(map);
-	}
+    /**
+     * 提交订单
+     *
+     * @param orderInfoVo
+     * @return
+     */
+    @GuiGuLogin
+    @Operation(summary = "提交订单")
+    @PostMapping("/orderInfo/submitOrder")
+    public Result<Map<String, String>> submitOrder(@RequestBody @Validated OrderInfoVo orderInfoVo) {
+        //1.获取用户ID
+        Long userId = AuthContextHolder.getUserId();
+        //2.调用业务逻辑处理订单提交
+        String orderNo = orderInfoService.submitOrder(userId, orderInfoVo);
+        //3.返回对象封装订单编号
+        Map<String, String> map = new HashMap<>();
+        map.put("orderNo", orderNo);
+        return Result.ok(map);
+    }
 
 
-	/**
-	 * 根据订单编号查询订单信息
-	 * TODO 场景：如果是提供给用户端需要登录才能访问(订单编号+用户ID)；如果是系统内部调用，则不需要登录
-	 * @param orderNo
-	 * @return
-	 */
-	@Operation(summary = "根据订单编号查询订单信息")
-	@GetMapping("/orderInfo/getOrderInfo/{orderNo}")
-	public Result<OrderInfo> getOrderInfo(@PathVariable("orderNo") String orderNo) {
-		OrderInfo orderInfo = orderInfoService.getOrderInfo(orderNo);
-		return Result.ok(orderInfo);
-	}
+    /**
+     * 根据订单编号查询订单信息
+     * TODO 场景：如果是提供给用户端需要登录才能访问(订单编号+用户ID)；如果是系统内部调用，则不需要登录
+     *
+     * @param orderNo
+     * @return
+     */
+    @Operation(summary = "根据订单编号查询订单信息")
+    @GetMapping("/orderInfo/getOrderInfo/{orderNo}")
+    public Result<OrderInfo> getOrderInfo(@PathVariable("orderNo") String orderNo) {
+        OrderInfo orderInfo = orderInfoService.getOrderInfo(orderNo);
+        return Result.ok(orderInfo);
+    }
 
-	/**
-	 * 分页查询当前用户订单列表
-	 * @param page
-	 * @param limit
-	 * @return
-	 */
-	@GuiGuLogin
-	@Operation(summary = "分页查询当前用户订单列表(包含订单明细)")
-	@GetMapping("/orderInfo/findUserPage/{page}/{limit}")
-	public Result<Page<OrderInfo>> findUserOrderPage(@PathVariable Long page, @PathVariable Long limit){
-		//1.获取用户ID
-		Long userId = AuthContextHolder.getUserId();
-		//2.创建分页对象Page，封装当前页，页大小
-		Page<OrderInfo> pageInfo = new Page<>(page, limit);
-		//3.调用业务层分页方法
-		pageInfo = orderInfoService.findUserOrderPage(pageInfo, userId);
-		return Result.ok(pageInfo);
-	}
+    /**
+     * 分页查询当前用户订单列表
+     *
+     * @param page
+     * @param limit
+     * @return
+     */
+    @GuiGuLogin
+    @Operation(summary = "分页查询当前用户订单列表(包含订单明细)")
+    @GetMapping("/orderInfo/findUserPage/{page}/{limit}")
+    public Result<Page<OrderInfo>> findUserOrderPage(@PathVariable Long page, @PathVariable Long limit) {
+        //1.获取用户ID
+        Long userId = AuthContextHolder.getUserId();
+        //2.创建分页对象Page，封装当前页，页大小
+        Page<OrderInfo> pageInfo = new Page<>(page, limit);
+        //3.调用业务层分页方法
+        pageInfo = orderInfoService.findUserOrderPage(pageInfo, userId);
+        return Result.ok(pageInfo);
+    }
+
+
+    /**
+     * 用户付款成功后更新订单状态以及虚拟物品发货
+     *
+     * @param orderNo
+     * @return
+     */
+    @Operation(summary = "用户付款成功后更新订单状态以及虚拟物品发货")
+    @GetMapping("/orderInfo/orderPaySuccess/{orderNo}")
+    public Result orderPaySuccess(@PathVariable("orderNo") String orderNo) {
+        orderInfoService.orderPaySuccess(orderNo);
+        return Result.ok();
+    }
 }
 

service/service-order/src/main/java/com/atguigu/tingshu/order/mapper/OrderInfoMapper.java

@@ -16,4 +16,13 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
      * @return
      */
     Page<OrderInfo> findUserOrderPage(Page<OrderInfo> pageInfo, @Param("userId") Long userId);
+
+    /**
+     * 更新订单状态
+     * @param orderNo 订单编号
+     * @param orderStatusCondition 期望订单状态
+     * @param orderStatus 更新后订单状态
+     * @return
+     */
+    int updateOrderStatus(@Param("orderNo") String orderNo, @Param("orderStatusCondition") String orderStatusCondition, @Param("orderStatus") String orderStatus);
 }

service/service-order/src/main/java/com/atguigu/tingshu/order/service/OrderInfoService.java

@@ -51,4 +51,12 @@ public interface OrderInfoService extends IService<OrderInfo> {
      * @param orderId
      */
     void cancelOrder(Long orderId);
+
+    /**
+     * 用户付款成功后更新订单状态以及虚拟物品发货
+     *
+     * @param orderNo
+     * @return
+     */
+    void orderPaySuccess(String orderNo);
 }

service/service-order/src/main/java/com/atguigu/tingshu/order/service/impl/OrderInfoServiceImpl.java

@@ -513,4 +513,39 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         }
     }
 
+    /**
+     * 用户付款成功后：更新订单状态以及虚拟物品发货
+     * 面试：毫厘之间，用户最后一刹那付款。订单延迟关单将订单关闭。此时数据不一致
+     *
+     * @param orderNo
+     * @return
+     */
+    @Override
+    public void orderPaySuccess(String orderNo) {
+        //1.采用乐观锁方式更新订单状态：更细条件：订单编号+订单状态
+        int count = baseMapper.updateOrderStatus(orderNo, ORDER_STATUS_UNPAID, ORDER_STATUS_PAID);
+        if (count == 0) {
+            //2.TODO 如果更新失败说明订单已经被关闭,远程调用支付系统：主动查询支付状态，如果是已支付，给用户发起退款
+            throw new GuiguException(500, "更新订单为已支付失败:" + orderNo);
+        }
+
+        //2.远程调用“用户服务”完成虚拟物品发货
+        OrderInfo orderInfo = this.getOrderInfo(orderNo);
+        //2.1 构建虚拟物品发货VO对象
+        UserPaidRecordVo userPaidRecordVo = new UserPaidRecordVo();
+        userPaidRecordVo.setOrderNo(orderNo);
+        userPaidRecordVo.setUserId(orderInfo.getUserId());
+        userPaidRecordVo.setItemType(orderInfo.getItemType());
+        List<OrderDetail> orderDetailList = orderInfo.getOrderDetailList();
+        if (CollUtil.isNotEmpty(orderDetailList)) {
+            List<Long> collect = orderDetailList.stream().map(OrderDetail::getItemId).collect(Collectors.toList());
+            userPaidRecordVo.setItemIdList(collect);
+            //2.2 远程调用用户服务，完成虚拟物品发货
+            Result result = userFeignClient.savePaidRecord(userPaidRecordVo);
+            //2.3 判断响应业务状态码
+            if(!result.getCode().equals(200)){
+                throw new GuiguException(500, "虚拟物品发货失败:" + orderNo);
+            }
+        }
+    }
 }

service/service-order/src/main/resources/mapper/OrderInfoMapper.xml

@@ -14,6 +14,12 @@
         </collection>
     </resultMap>
 
+    <!--采用乐观锁更新-->
+    <update id="updateOrderStatus">
+        UPDATE order_info set order_status = #{orderStatus}
+        where order_no = #{orderNo} and order_status = #{orderStatusCondition}
+    </update>
+
     <!--订单跟订单明细一对多-->
     <select id="findUserOrderPage1" resultMap="orderInfoMap">
         select

service/service-payment/pom.xml

@@ -33,6 +33,22 @@
             <artifactId>rabbit-util</artifactId>
             <version>1.0</version>
         </dependency>
+        <!--seata-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
+            <!-- 默认seata客户端版本比较低，排除后重新引入指定版本-->
+            <exclusions>
+                <exclusion>
+                    <groupId>io.seata</groupId>
+                    <artifactId>seata-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

service/service-payment/src/main/java/com/atguigu/tingshu/payment/api/WxPayApiController.java

@@ -4,6 +4,7 @@ import com.atguigu.tingshu.common.login.GuiGuLogin;
 import com.atguigu.tingshu.common.result.Result;
 import com.atguigu.tingshu.common.util.AuthContextHolder;
 import com.atguigu.tingshu.payment.service.WxPayService;
+import com.wechat.pay.java.service.refund.model.Refund;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -24,8 +25,9 @@ public class WxPayApiController {
 
     /**
      * 获取小程序拉起微信支付所需参数
+     *
      * @param paymentType 支付类型 1301-订单 1302-充值
-     * @param orderNo 交易订单号或充值订单号
+     * @param orderNo     交易订单号或充值订单号
      * @return {"timeStamp":"","package":"","paySign":"","signType":"RSA","nonceStr":""}
      */
     @Operation(summary = "获取小程序拉起微信支付所需参数")
@@ -33,7 +35,7 @@ public class WxPayApiController {
     public Result<Map<String, String>> createJsapi(
             @PathVariable("paymentType") String paymentType,
             @PathVariable("orderNo") String orderNo
-    ){
+    ) {
         //1.获取用户ID
         Long userId = AuthContextHolder.getUserId();
         //2.调用支付业务层对接微信
@@ -44,16 +46,58 @@ public class WxPayApiController {
 
     /**
      * 查询订单交易状态
+     *
      * @param orderNo
      * @return
      */
     @GuiGuLogin
     @Operation(summary = "查询订单交易状态")
     @GetMapping("/wxPay/queryPayStatus/{orderNo}")
-    public Result<Boolean> queryPayStatus(@PathVariable("orderNo") String orderNo){
+    public Result<Boolean> queryPayStatus(@PathVariable("orderNo") String orderNo) {
         //1.调用微信查询订单状态
         boolean result = wxPayService.queryPayStatus(orderNo);
         return Result.ok(result);
     }
 
+    /**
+     * 用户付款成功后，微信支付回调接口
+     *
+     * @param request
+     * @return {code:"SUCCESS",message:"支付成功"}
+     */
+   /* @Operation(summary = "用户付款成功后，微信支付回调接口")
+    @PostMapping("/wxPay/notify")
+    public Result<Map<String, String>> notifyPayResult(HttpServletRequest request) {
+        Map<String, String> map = wxPayService.notifyPayResult(request);
+        return Result.ok(map);
+    }*/
+
+
+    /**
+     * 发起退款
+     *
+     * @param orderNo
+     * @return
+     */
+
+    @Operation(summary = "发起退款")
+    @GetMapping("/wxPay/closeWxPay/{orderNo}")
+    public Result<Refund> closeWxPay(@PathVariable("orderNo") String orderNo) {
+        wxPayService.closeWxPay(orderNo);
+        return Result.ok();
+    }
+
+    /**
+     * 发起退款
+     *
+     * @param orderNo
+     * @return
+     */
+
+    @Operation(summary = "发起退款")
+    @GetMapping("/wxPay/refunds/{orderNo}")
+    public Result<Refund> refunds(@PathVariable("orderNo") String orderNo) {
+        Refund refund = wxPayService.refunds(orderNo);
+        return Result.ok(refund);
+    }
 }

service/service-payment/src/main/java/com/atguigu/tingshu/payment/service/PaymentInfoService.java

@@ -2,6 +2,7 @@ package com.atguigu.tingshu.payment.service;
 
 import com.atguigu.tingshu.model.payment.PaymentInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.wechat.pay.java.service.payments.model.Transaction;
 
 public interface PaymentInfoService extends IService<PaymentInfo> {
 
@@ -15,4 +16,9 @@ public interface PaymentInfoService extends IService<PaymentInfo> {
     public PaymentInfo savePaymentInfo(String paymentType, String orderNo);
 
 
+    /**
+     * 用户付款成功后，更新本地交易记录状态
+     * @param transaction
+     */
+    void updatePaymentInfo(Transaction transaction);
 }

service/service-payment/src/main/java/com/atguigu/tingshu/payment/service/WxPayService.java

@@ -1,5 +1,8 @@
 package com.atguigu.tingshu.payment.service;
 
+import com.wechat.pay.java.service.refund.model.Refund;
+import jakarta.servlet.http.HttpServletRequest;
+
 import java.util.Map;
 
 public interface WxPayService {
@@ -18,4 +21,24 @@ public interface WxPayService {
      * @return
      */
     boolean queryPayStatus(String orderNo);
+
+    /**
+     * 用户付款成功后，微信支付回调接口
+     *
+     * @param request
+     * @return {code:"SUCCESS",message:"支付成功"}
+     */
+    Map<String, String> notifyPayResult(HttpServletRequest request);
+
+    /**
+     * 微信退款
+     * @param orderNo
+     */
+    Refund refunds(String orderNo);
+
+    /**
+     * 关闭微信交易
+     * @param orderNo
+     */
+    public void closeWxPay(String orderNo);
 }

service/service-payment/src/main/java/com/atguigu/tingshu/payment/service/impl/PaymentInfoServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.lang.Assert;
 import com.atguigu.tingshu.account.AccountFeignClient;
 import com.atguigu.tingshu.common.constant.SystemConstant;
 import com.atguigu.tingshu.common.execption.GuiguException;
+import com.atguigu.tingshu.common.result.Result;
 import com.atguigu.tingshu.model.account.RechargeInfo;
 import com.atguigu.tingshu.model.order.OrderInfo;
 import com.atguigu.tingshu.model.payment.PaymentInfo;
@@ -12,9 +13,13 @@ import com.atguigu.tingshu.payment.mapper.PaymentInfoMapper;
 import com.atguigu.tingshu.payment.service.PaymentInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wechat.pay.java.service.payments.model.Transaction;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 import static com.atguigu.tingshu.common.constant.SystemConstant.ORDER_STATUS_CANCEL;
 import static com.atguigu.tingshu.common.constant.SystemConstant.ORDER_STATUS_PAID;
 
@@ -90,4 +95,51 @@ public class PaymentInfoServiceImpl extends ServiceImpl<PaymentInfoMapper, Payme
         baseMapper.insert(paymentInfo);
         return paymentInfo;
     }
+
+    /**
+     * 用户付款成功后，更新本地交易记录状态
+     *
+     * @param transaction 微信支付交易对象
+     */
+    @Override
+    @GlobalTransactional(rollbackFor = Exception.class)
+    public void updatePaymentInfo(Transaction transaction) {
+        //1.根据订单编号查询本地交易记录 判断状态
+        String orderNo = transaction.getOutTradeNo();
+        PaymentInfo paymentInfo = baseMapper.selectOne(
+                new LambdaQueryWrapper<PaymentInfo>()
+                        .eq(PaymentInfo::getOrderNo, orderNo)
+        );
+        String paymentStatus = paymentInfo.getPaymentStatus();
+
+        if (SystemConstant.PAYMENT_STATUS_UNPAID.equals(paymentStatus)) {
+            //2.更新本地交易记录状态：状态修改为已支付、关联微信交易订单编号、回调时间、回调内容
+            paymentInfo.setOutTradeNo(transaction.getTransactionId());
+            paymentInfo.setPaymentStatus(SystemConstant.PAYMENT_STATUS_PAID);
+            paymentInfo.setCallbackTime(new Date());
+            paymentInfo.setCallbackContent(transaction.toString());
+            //TODO 可选 乐观锁更新： UPDATE payment_info set payment_status = '1402',callback_time = ? ,callback_content = ?,out_trade_no = ? where payment_status='1401' and order_no = ?
+            baseMapper.updateById(paymentInfo);
+            //支付类型：1301-订单 1302-充值
+            String paymentType = paymentInfo.getPaymentType();
+            //3.处理支付类型为：订单  远程调用订单服务更新订单状态
+            if (SystemConstant.PAYMENT_TYPE_ORDER.equals(paymentType)) {
+                //3.1 远程调用订单服务，更新订单支付状态以及完成虚拟物品发货
+                Result result = orderFeignClient.orderPaySuccess(orderNo);
+
+                //3.2 判断远程调用结果响应业务状态码
+                if (!result.getCode().equals(200)) {
+                    throw new GuiguException(500, "订单更新异常:" + orderNo);
+                }
+            }
+            //4. 处理支付类型为：充值  远程调用账户服务更新充值状态以及完成充值业务
+            if (SystemConstant.PAYMENT_TYPE_RECHARGE.equals(paymentType)) {
+                Result result = accountFeignClient.rechargePaySuccess(orderNo);
+                //3.2 判断远程调用结果响应业务状态码
+                if (!result.getCode().equals(200)) {
+                    throw new GuiguException(500, "更新充值异常:" + orderNo);
+                }
+            }
+        }
+    }
 }

service/service-payment/src/main/java/com/atguigu/tingshu/payment/service/impl/WxPayServiceImpl.java

@@ -1,21 +1,32 @@
 package com.atguigu.tingshu.payment.service.impl;
 
+import cn.hutool.core.util.IdUtil;
 import com.atguigu.tingshu.common.constant.SystemConstant;
 import com.atguigu.tingshu.common.execption.GuiguException;
 import com.atguigu.tingshu.model.payment.PaymentInfo;
 import com.atguigu.tingshu.payment.config.WxPayV3Config;
 import com.atguigu.tingshu.payment.service.PaymentInfoService;
 import com.atguigu.tingshu.payment.service.WxPayService;
+import com.atguigu.tingshu.payment.util.PayUtil;
 import com.wechat.pay.java.core.RSAAutoCertificateConfig;
+import com.wechat.pay.java.core.notification.NotificationParser;
+import com.wechat.pay.java.core.notification.RequestParam;
 import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
 import com.wechat.pay.java.service.payments.jsapi.model.*;
 import com.wechat.pay.java.service.payments.model.Transaction;
+import com.wechat.pay.java.service.refund.RefundService;
+import com.wechat.pay.java.service.refund.model.AmountReq;
+import com.wechat.pay.java.service.refund.model.CreateRequest;
+import com.wechat.pay.java.service.refund.model.Refund;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 @Service
 @Slf4j
@@ -30,6 +41,9 @@ public class WxPayServiceImpl implements WxPayService {
     @Autowired
     private WxPayV3Config wxPayV3Config;
 
+    @Autowired
+    private RedisTemplate redisTemplate;
+
     /**
      * 获取小程序拉起微信支付所需参数
      *
@@ -96,7 +110,7 @@ public class WxPayServiceImpl implements WxPayService {
      */
     @Override
     public boolean queryPayStatus(String orderNo) {
-        //1.构建支付service对象
+       /* //1.构建支付service对象
         JsapiServiceExtension service =
                 new JsapiServiceExtension.Builder().config(config).build();
         //2.根据商户侧订单编号查询交易
@@ -112,6 +126,132 @@ public class WxPayServiceImpl implements WxPayService {
                 return true;
             }
         }
-        return false;
+        return false;*/
+
+        //1.模拟创建微信交易对象
+        Transaction transaction = new Transaction();
+        transaction.setTransactionId("wx"+ IdUtil.getSnowflakeNextId());
+        transaction.setOutTradeNo(orderNo);
+        //2.调用本地交易记录业务方法处理核心业务
+        paymentInfoService.updatePaymentInfo(transaction);
+        return true;
+    }
+
+    /**
+     * 用户付款成功后，微信支付回调接口
+     *
+     * @param request
+     * @return {code:"SUCCESS",message:"支付成功"}
+     */
+    @Override
+    public Map<String, String> notifyPayResult(HttpServletRequest request) {
+        //1.验签及获取请求体业务数据 防止出现虚假通知
+        //1.1 获取HTTP请求头中会包含报文的签名信息，用于验签
+        String signature = request.getHeader("Wechatpay-Signature");
+        String serial = request.getHeader("Wechatpay-Serial");
+        String nonce = request.getHeader("Wechatpay-Nonce");
+        String timestamp = request.getHeader("Wechatpay-Timestamp");
+        String signaureType = request.getHeader("Wechatpay-Signature-Type");
+        log.info("[支付服务]签名：{}，序列号：{}，随机数：{}，时间戳：{}，签名类型：{}", signature, serial, nonce, timestamp, signaureType);
+
+        //1.2 创建请求参数对象：封装微信提交请求体参数（密文）
+        String body = PayUtil.readData(request);
+        log.info("[支付服务]微信请求体参数：{}", body);
+        RequestParam requestParam =
+                new RequestParam.Builder()
+                        .serialNumber(serial)
+                        .nonce(nonce)
+                        .signature(signature)
+                        .timestamp(timestamp)
+                        .body(body)
+                        .build();
+
+        //1.2 基于签名信息进行验签，验签通过后获取请求体业务数据
+        NotificationParser parser = new NotificationParser(config);
+        Transaction transaction = parser.parse(requestParam, Transaction.class);
+
+        //2.幂等性处理
+        if (transaction != null) {
+            //2.1 获取本次通知唯一标识：使用微信订单交易号、商户订单编号等
+            String outTradeNo = transaction.getOutTradeNo();
+            //2.2 构建RedisKey采用set ex nx 存入Redis
+            String redisKey = "pay:weixin:notify:" + outTradeNo;
+            Boolean flag = redisTemplate.opsForValue().setIfAbsent(redisKey, outTradeNo, 25, TimeUnit.HOURS);
+            if (flag) {
+                //3.业务校验：验证 支付状态（支付成功）、金额（用户实付金额跟应付金额是否一致）
+                Transaction.TradeStateEnum tradeState = transaction.getTradeState();
+                //3.1 验证付款状态
+                if (Transaction.TradeStateEnum.SUCCESS == tradeState) {
+                    //3.2 验证金额
+                    Integer payerTotal = transaction.getAmount().getPayerTotal();
+                    if (payerTotal.intValue() == 1) {
+                        //4.TODO 核心业务：更新本地交易记录（状态，微信支付订单号、回调信息）
+                        paymentInfoService.updatePaymentInfo(transaction);
+                        //5.响应微信支付系统：SUCCESS
+                        Map<String, String> map = new HashMap<>();
+                        map.put("code", "SUCCESS");
+                        map.put("message", "成功");
+                        return map;
+                    }
+                    try {
+                    } catch (Exception e) {
+                        redisTemplate.delete(redisKey);
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        }
+
+
+        return null;
+    }
+
+    /**
+     * 退款
+     *
+     * @param orderNo
+     */
+    @Override
+    public Refund refunds(String orderNo) {
+        RefundService service =
+                new RefundService.Builder().config(config).build();
+        CreateRequest request = new CreateRequest();
+        //TODO 查询退款结果
+        //service.queryByOutRefundNo()
+        //TODO 远程调用获取订单信息
+        AmountReq amountReq = new AmountReq();
+        amountReq.setTotal(1L);
+        amountReq.setRefund(1L);
+        amountReq.setCurrency("CNY");
+        request.setAmount(amountReq);
+        request.setOutTradeNo(orderNo);
+        request.setReason("用户申请退款:" + orderNo);
+        //request.setSubMchid(wxPayV3Config.getMerchantId());
+        request.setOutRefundNo("dk"+orderNo);
+        Refund refund = service.create(request);
+        if (refund != null) {
+            log.info("[支付服务]退款响应结果：{}", refund);
+            return refund;
+        }
+        return null;
+    }
+
+
+    /**
+     * 关闭微信支付订单
+     *
+     * @param orderNo
+     * @return
+     */
+    @Override
+    public void closeWxPay(String orderNo) {
+        //1.构建支付service对象
+        JsapiServiceExtension service =
+                new JsapiServiceExtension.Builder().config(config).build();
+        //2.根据商户侧订单编号关闭交易
+        CloseOrderRequest request = new CloseOrderRequest();
+        request.setMchid(wxPayV3Config.getMerchantId());
+        request.setOutTradeNo(orderNo);
+        service.closeOrder(request);
     }
 }

service/service-payment/src/main/java/com/atguigu/tingshu/payment/vo/WeChatRefundParam.java

@@ -0,0 +1,44 @@
+package com.atguigu.tingshu.payment.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class WeChatRefundParam {
+
+    /**
+     * 微信支付订单号，微信支付订单号和商家订单号二选一
+     */
+    private String transactionId;
+
+    /**
+     * 商家订单号，对应 out_trade_no，
+     */
+    private String orderNo;
+
+    /**
+     * 商户退款单号，对应out_refund_no
+     */
+    private String refundOrderId;
+
+    /**
+     * 退款原因，选填
+     */
+    private String reason;
+
+    ///**
+    // * 回调地址
+    // */
+    //private WxNotifyType notify;
+    //
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundMoney;
+    //
+    /**
+     * 原订单金额，必填
+     */
+    private BigDecimal totalMoney;
+}

service/service-user/src/main/java/com/atguigu/tingshu/user/api/UserInfoApiController.java

@@ -12,6 +12,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -97,5 +98,17 @@ public class UserInfoApiController {
         userInfoService.savePaidRecord(userPaidRecordVo);
         return Result.ok();
     }
+
+
+    /**
+     * 更新VIP状态：处理过期会员
+     * @return
+     */
+    @Operation(summary = "更新VIP状态：处理过期会员")
+    @GetMapping("/updateVipExpireStatus")
+    public Result updateVipExpireStatus(){
+        userInfoService.updateVipExpireStatus(new Date());
+        return Result.ok();
+    }
 }
 

service/service-user/src/main/java/com/atguigu/tingshu/user/service/UserInfoService.java

@@ -5,6 +5,7 @@ import com.atguigu.tingshu.vo.user.UserInfoVo;
 import com.atguigu.tingshu.vo.user.UserPaidRecordVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -64,4 +65,10 @@ public interface UserInfoService extends IService<UserInfo> {
      * @return
      */
     void savePaidRecord(UserPaidRecordVo userPaidRecordVo);
+
+    /**
+     * 更新VIP状态：处理过期会员
+     * @return
+     */
+    void updateVipExpireStatus(Date date);
 }

service/service-user/src/main/java/com/atguigu/tingshu/user/service/impl/UserInfoServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -268,4 +269,24 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         strategy.handlerPaidRecord(userPaidRecordVo);
     }
 
+    /**
+     * 更新VIP状态：处理过期会员
+     *
+     * @return
+     */
+    @Override
+    public void updateVipExpireStatus(Date date) {
+        //1.查询所有过期会员
+        LambdaQueryWrapper<UserInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserInfo::getIsVip, 1);
+        queryWrapper.lt(UserInfo::getVipExpireTime, date);
+        List<UserInfo> userInfoList = baseMapper.selectList(queryWrapper);
+        //2.更新所有过期会员的VIP标识
+        if (CollUtil.isNotEmpty(userInfoList)) {
+            for (UserInfo userInfo : userInfoList) {
+                userInfo.setIsVip(0);
+                baseMapper.updateById(userInfo);
+            }
+        }
+    }
 }