Commit 81981157 authored by wlx@33.cn's avatar wlx@33.cn

Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev

parents 88cc1592 f6cd48bb
......@@ -86,9 +86,7 @@ public class UserAssetController {
public ResponseVO<UserAssetVo> getOwnAsset(@ApiParam(name = "coin", value = "币名称") @RequestBody JSONObject obj, @ApiIgnore @RequestAttribute Header header) {
String uid = header.getUid();
String coin = obj.getString("coin");
SkuVo skuVo = skuService.querySkuByCoin(coin);
UserAssetVo userAssetVo = userAssetService.getOwnAsset(uid, coin);
userAssetVo.setSkuVo(skuVo);
User user = userService.getByUid(uid);
userAssetVo.setAddress(user.getAddress());
return new ResponseVO<>(MallResponseEnum.SUCCESS, userAssetVo);
......
......@@ -131,7 +131,8 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset
asset.setAmount(asset.getAmount().setScale(2, BigDecimal.ROUND_DOWN));
asset.setFrozen(asset.getFrozen().setScale(2, BigDecimal.ROUND_DOWN));
BeanUtils.copyProperties(asset, userAssetVo);
SkuVo skuVo = skuService.querySkuByCoin(asset.getCoin());
String goodsCoin = asset.getGoodsCoin();
SkuVo skuVo = skuService.querySkuByCoin(goodsCoin);
if (skuVo != null) {
String goodsId = skuVo.getGoodsId();
GoodSpu goodSpu = goodSpuService.goodSpu(goodsId);
......@@ -143,6 +144,7 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset
if (sysConfig != null) {
userAssetVo.setLogo(sysConfig.getDictValue());
}
userAssetVo.setSkuVo(skuVo);
}
return userAssetVo;
}
......
......@@ -331,21 +331,21 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
int saleType = spuService.getNftSalesType(orderSkuVo.getSkuId());
if(saleType == 2){
String serialNo = skuService.getSerialNo(skuVo.getCommodityPassId());
JSONArray array = JSON.parseArray(serialNo);
List<Long> array = JSON.parseArray(serialNo, Long.class);
if(array.size()<orderSkuVo.getNum()){
throw new RuntimeException("库存不足!!!");
}
int index = 1;
List<String> list = new ArrayList<>();
for (Object o:array) {
List<Long> list = new ArrayList<>();
for (Long o:array) {
if(index<=orderSkuVo.getNum()){
list.add(o.toString());
list.add(o);
index ++;
}else{
break;
}
}
array.remove(list);
boolean remove = array.removeAll(list);
skuService.updateSerialNo(JSON.toJSONString(array),skuVo.getCommodityPassId());
orderDetail.setSerialNo(JSON.toJSONString(list));
}
......@@ -825,7 +825,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
UserAsset coin = userAssetService.getCoin(order.getUid(), o.toString());
if (coin == null) {
coin = new UserAsset();
coin.setCoin(orderDetail.getCoin());
coin.setCoin(o.toString());
coin.setAmount(new BigDecimal(orderDetail.getNumber()));
coin.setUid(order.getUid());
coin.setType(1);
......@@ -1083,7 +1083,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
UserAsset coin = userAssetService.getCoin(order.getUid(), o.toString());
if (coin == null) {
coin = new UserAsset();
coin.setCoin(orderDetail.getCoin());
coin.setCoin(o.toString());
coin.setAmount(new BigDecimal(orderDetail.getNumber()));
coin.setUid(order.getUid());
coin.setType(1);
......@@ -1349,11 +1349,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
return null;
}
public static void main(String[] args) {
String str = "[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]";
JSONArray array = JSON.parseArray(str);
System.out.println(array.toJSONString());
}
/* private String tranCoinAndNft(String skuId,String from,String to,BigDecimal number,int goodsType,String coin) {
//商品通证(0.否 1.是,自动生成Token 2.是,使用外部既有Token)
......@@ -1396,4 +1391,5 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
}*/
}
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