zhangkaikai пре 2 година
родитељ
комит
26106740e6

+ 3 - 6
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserMineController.java

@@ -308,8 +308,6 @@ public class UserMineController extends BaseApiController {
 
         // 校验受赠人信息
         SysUser toUser = userService.selectUserByPhoneNumber(coinTransferParam.getPhone());
-
-        // 查询转赠人信息
         if (Objects.isNull(toUser)) {
             return AjaxResult.error("未查询到受赠用户");
         }
@@ -317,16 +315,15 @@ public class UserMineController extends BaseApiController {
             return AjaxResult.error("不能转赠给自己");
         }
 
+        SysUser fromUser = userService.getById(fromUserId);
         CoinTransferParamDTO coinTransferParamDTO = new CoinTransferParamDTO();
         coinTransferParamDTO.setFromUserId(fromUserId);
         coinTransferParamDTO.setToUserId(toUser.getUserId());
-        coinTransferParamDTO.setToPhone(toUser.getPhonenumber());
-        coinTransferParamDTO.setFromPhone(coinTransferParam.getPhone());
+        coinTransferParamDTO.setToPhone(coinTransferParam.getPhone());
+        coinTransferParamDTO.setFromPhone(fromUser.getPhonenumber());
         coinTransferParamDTO.setRealTransferCoin(coinTransferParam.getTransferCoin() - 10);
         coinTransferParamDTO.setDeductTransferCoin(10);
 
-
-
         // 转赠盲豆
         boolean flag = userCoinService.transfer(coinTransferParamDTO);
 

+ 1 - 1
mp-service/src/main/java/com/qs/mp/user/service/impl/UserCoinServiceImpl.java

@@ -121,7 +121,7 @@ public class UserCoinServiceImpl extends ServiceImpl<UserCoinMapper, UserCoin> i
       userCoinFromLog.setMoney(userCoin.getCoin() - (coinTransferParamDTO.getRealTransferCoin() + coinTransferParamDTO.getDeductTransferCoin()));
       userCoinFromLog.setLogMoney(-(coinTransferParamDTO.getRealTransferCoin() + coinTransferParamDTO.getDeductTransferCoin()));
       userCoinFromLog.setIncomeExpense(CoinLogTypeEnum.EXPENSES);
-      userCoinFromLog.setLogText("盲豆转赠:(" + coinTransferParamDTO.getFromPhone() + ")" + "|转赠折损:" + coinTransferParamDTO.getDeductTransferCoin() + "盲豆");
+      userCoinFromLog.setLogText("盲豆转赠:(" + coinTransferParamDTO.getToPhone() + ")" + "|转赠折损:" + coinTransferParamDTO.getDeductTransferCoin() + "盲豆");
       userCoinFromLog.setBizTime(new Date());
       userCoinFromLog.setCreatedTime(new Date());
       userCoinFromLog.setUpdatedTime(new Date());