fix:..

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/WxController.java

@@ -19,6 +19,9 @@ import com.ylx.common.core.domain.R;
 
 import com.ylx.common.core.domain.model.WxLoginUser;
 import com.ylx.common.enums.BusinessType;
+import com.ylx.common.utils.MessageUtils;
+import com.ylx.framework.manager.AsyncManager;
+import com.ylx.framework.manager.factory.AsyncFactory;
 import com.ylx.framework.web.service.WxTokenService;
 import com.ylx.massage.domain.vo.TWxUserVo;
 import com.ylx.massage.utils.LocationUtil;
@@ -246,6 +249,8 @@ public class WxController extends BaseController {
             }
             wxUser.setToken(token);
             // 返回用户信息
+            // 记录登录信息
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(wxUser.getCOpenid(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
             return R.ok(wxUser);
         } catch (WxErrorException e) {
             log.error("登录失败：" + e.getMessage(), e);

nightFragrance-admin/src/main/resources/application-dev.yml

@@ -214,7 +214,7 @@ wx:
   # 商户秘钥
   mch-key: 39C9AIJ1RQKT3I8V16BYZ6LLBI0H30NB
   # 异步回调地址
-  notify-url: https://6e37252b.r23.cpolar.top/wx/pay/payNotify
+  notify-url: https://5c29a93.r7.cpolar.top/wx/pay/payNotify
   # 证书地址
   cert-path: D:/1675015090_20240424_cert/apiclient_cert.pem
   # 证书秘钥地址

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -137,7 +137,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             throw new ServiceException("用户不存在");
         }
         if (user.getdBalance().compareTo(orderNew.getTotalPrice()) < MassageConstants.INTEGER_ZERO) {
-            return false;
+            throw new ServiceException("账户金额不够请充值");
         } else {
             // 更新用户金额 及下单此时
             TWxUser paramUser = new TWxUser();

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TTxRecordServiceImpl.java

@@ -41,22 +41,28 @@ public class TTxRecordServiceImpl extends ServiceImpl<TTxRecordMapper, TTxRecord
 
     @Resource
     private TJsService jsService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public TTxRecord applicationCash(TTxRecord record) {
-        if(StringUtils.isBlank(record.getcOpenId())){
+        if (StringUtils.isBlank(record.getcOpenId())) {
             throw new ServiceException("OpenID不能为空");
         }
-        if(StringUtils.isBlank(record.getOpeningBank())){
+        if (StringUtils.isBlank(record.getOpeningBank())) {
             throw new ServiceException("开户行不能为空");
         }
-        if(StringUtils.isBlank(record.getBankAccount())){
+        if (StringUtils.isBlank(record.getBankAccount())) {
             throw new ServiceException("银行账号不能为空");
         }
-        if(null == record.getdPrice() || record.getdPrice().compareTo(BigDecimal.ZERO) <= 0){
-            throw new ServiceException("体现金额不能为空");
+
+        TWxUser user = wxUserService.getByOpenId(record.getcOpenId());
+        if (null == record.getdPrice() || record.getdPrice().compareTo(BigDecimal.ZERO) <= 0) {
+            throw new ServiceException("提现金额不能为空");
         }
 
+        if (record.getdPrice().compareTo(user.getdBalance()) > 0) {
+            throw new ServiceException("提现金额不能大于钱包余额");
+        }
         LambdaQueryWrapper<TJs> mhCompanyLambdaQueryWrapper = new LambdaQueryWrapper<>();
         mhCompanyLambdaQueryWrapper.eq(TJs::getcOpenId, record.getcOpenId());
         TJs js = jsService.getOne(mhCompanyLambdaQueryWrapper);