Commit f6cd48bb authored by 童得柱's avatar 童得柱

fix

parent f48bc076
...@@ -86,9 +86,7 @@ public class UserAssetController { ...@@ -86,9 +86,7 @@ public class UserAssetController {
public ResponseVO<UserAssetVo> getOwnAsset(@ApiParam(name = "coin", value = "币名称") @RequestBody JSONObject obj, @ApiIgnore @RequestAttribute Header header) { public ResponseVO<UserAssetVo> getOwnAsset(@ApiParam(name = "coin", value = "币名称") @RequestBody JSONObject obj, @ApiIgnore @RequestAttribute Header header) {
String uid = header.getUid(); String uid = header.getUid();
String coin = obj.getString("coin"); String coin = obj.getString("coin");
SkuVo skuVo = skuService.querySkuByCoin(coin);
UserAssetVo userAssetVo = userAssetService.getOwnAsset(uid, coin); UserAssetVo userAssetVo = userAssetService.getOwnAsset(uid, coin);
userAssetVo.setSkuVo(skuVo);
User user = userService.getByUid(uid); User user = userService.getByUid(uid);
userAssetVo.setAddress(user.getAddress()); userAssetVo.setAddress(user.getAddress());
return new ResponseVO<>(MallResponseEnum.SUCCESS, userAssetVo); return new ResponseVO<>(MallResponseEnum.SUCCESS, userAssetVo);
......
...@@ -131,7 +131,8 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset ...@@ -131,7 +131,8 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset
asset.setAmount(asset.getAmount().setScale(2, BigDecimal.ROUND_DOWN)); asset.setAmount(asset.getAmount().setScale(2, BigDecimal.ROUND_DOWN));
asset.setFrozen(asset.getFrozen().setScale(2, BigDecimal.ROUND_DOWN)); asset.setFrozen(asset.getFrozen().setScale(2, BigDecimal.ROUND_DOWN));
BeanUtils.copyProperties(asset, userAssetVo); BeanUtils.copyProperties(asset, userAssetVo);
SkuVo skuVo = skuService.querySkuByCoin(asset.getGoodsCoin()); String goodsCoin = asset.getGoodsCoin();
SkuVo skuVo = skuService.querySkuByCoin(goodsCoin);
if (skuVo != null) { if (skuVo != null) {
String goodsId = skuVo.getGoodsId(); String goodsId = skuVo.getGoodsId();
GoodSpu goodSpu = goodSpuService.goodSpu(goodsId); GoodSpu goodSpu = goodSpuService.goodSpu(goodsId);
...@@ -143,6 +144,7 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset ...@@ -143,6 +144,7 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset
if (sysConfig != null) { if (sysConfig != null) {
userAssetVo.setLogo(sysConfig.getDictValue()); userAssetVo.setLogo(sysConfig.getDictValue());
} }
userAssetVo.setSkuVo(skuVo);
} }
return userAssetVo; return userAssetVo;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment