Merge remote-tracking branch 'origin/master'

cloud-market2-server/src/main/java/com/muyu/market/server/controller/SysUserController.java

@@ -1,9 +1,6 @@
 package com.muyu.market.server.controller;
 
-import cn.hutool.http.useragent.UserAgentUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.utils.JwtUtils;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.LoginUser;
 import com.muyu.market.admain.SysUser;
@@ -14,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+
 @RestController
 @RequestMapping("/sysUser")
 @Tag( name = "个人信息控制层",description = "用于操作用户个人信息")
@@ -31,19 +30,18 @@ public class SysUserController {
         return Result.success(byId);
     }
     //充值
-
     @PostMapping("/updSysUserMoney")
     @Operation(summary = "充值",description = "通过修改余额达到充值效果")
     public Result updSysUserMoney(@Validated @RequestBody SysUser sysUser){
         Integer i = sysUserService.updSysUserMoney( sysUser );
         return i>0?Result.success():Result.error(500,"充值失败 请联系管理员");
     }
-    //充值
+    //支付
     @PostMapping("/paySysUserMoney")
     @Operation(summary = "支付",description = "通过修改余额达到支付效果")
-    public Result paySysUserMoney(@Validated @RequestBody SysUser sysUser){
-        Integer i = sysUserService.paySysUserMoney( sysUser );
+    public Result paySysUserMoney(@Validated @RequestParam("price") BigDecimal price){
+        Integer i = sysUserService.paySysUserMoney( price );
         return i>0?Result.success():Result.error(500,"充值失败 请联系管理员");
     }
-//    在哪写
+
 }

cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/SysUserServiceImpl.java

@@ -11,6 +11,7 @@ import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.JwtUtils;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.LoginUser;
+import com.muyu.market.admain.Myapi;
 import com.muyu.market.admain.SysUser;
 import com.muyu.market.server.mapper.SysUserMapper;
 import com.muyu.market.server.service.SysUserService;
@@ -37,24 +38,25 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 eq( "user_id",loginUser.getUserid() );
         return sysUserMapper.update( money );
     }
-    //充值余额
+    //fufei
     @Override
-    public Integer paySysUserMoney(SysUser sysUser) {
+    public Integer paySysUserMoney(BigDecimal price) {
+//        获取操作人信息
         LoginUser loginUser = SecurityUtils.getLoginUser();
+//        编译执行器
         UpdateWrapper<SysUser> sysUserUpdateWrapper = new UpdateWrapper<>();
         //价钱
-        BigDecimal moneyReq = sysUser.getMoney();
-        //用户
-        SysUser user = selectByUserId( Math.toIntExact( sysUser.getUserId() ) );
+//        BigDecimal moneyReq = sysUser.getMoney();
+        //查询登录人信息
+        SysUser user = selectByUserId( Math.toIntExact( loginUser.getUserid() ) );
         //用户余额
         BigDecimal userMoney = user.getMoney();
-        int i = userMoney.compareTo( moneyReq );
+        int i = userMoney.compareTo( price );
         if (i < 0) {
             throw new RuntimeException("余额不足 请充值");
         }
-
-        UpdateWrapper<SysUser> money = sysUserUpdateWrapper.setSql("money=money-"+sysUser.getMoney()).
-                eq( "user_id",loginUser.getUserid() );
+        UpdateWrapper<SysUser> money = sysUserUpdateWrapper.setSql("money=money-"+price).
+                eq( "user_id",user.getUserId() );
         return sysUserMapper.update( money );
     }
     //回显用户信息

cloud-market2-server/src/main/java/com/muyu/market/server/service/SysUserService.java

@@ -1,8 +1,11 @@
 package com.muyu.market.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.market.admain.Myapi;
 import com.muyu.market.admain.SysUser;
 
+import java.math.BigDecimal;
+
 public interface SysUserService extends IService<SysUser> {
 
     /**
@@ -15,10 +18,10 @@ public interface SysUserService extends IService<SysUser> {
     /**
      * 充值用户余额
      *
-     * @param sysUser
+     * @param
      * @return void
      */
-    Integer paySysUserMoney(SysUser sysUser);
+    Integer paySysUserMoney(BigDecimal price);
 
     /**
      * 回显用户余额