Merge remote-tracking branch 'origin/dev-rht-pay' into dev-rht-pay

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1283,6 +1283,11 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     @Override
     public TbOrder selectOrderByNum(String orderNum) {
         TbOrder tbOrder = appOrderDao.selectOne(new QueryWrapper<TbOrder>().eq("order_number", orderNum));
+        //插入优惠券金额
+        if (tbOrder.getCouponId() != null) {
+            TbCouponUser tbCouponUser = tbCouponUserDao.selectById(tbOrder.getCouponId());
+            tbOrder.setCouponMoney(tbCouponUser.getMoney());
+        }
         return tbOrder;
     }
 

src/main/java/com/sqx/modules/pay/controller/CashController.java

@@ -405,6 +405,7 @@ public class CashController {
 
     private Result aliPay(CashOut one) {
         RLock lock = redissonClient.getLock(String.format(RedisKey.CASH_OUT_LOCK, one.getUserId()));
+        lock.lock();
         try {
             log.error("进来了！！！");
             if (one == null) {
@@ -600,6 +601,6 @@ public class CashController {
     @ResponseBody
     public Result confirmCash(@PathVariable Long cashId) {
         cashOutService.confirmCash(cashId);
-        return Result.success();
+        return Result.success("转账成功");
     }
 }