Skip to content

M
mall-server
Commit ef38da45 authored by wlx@33.cn's avatar wlx@33.cn
Browse files
Options

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

parents 0b3e3f7c 704469c7
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 16 deletions
mall-server-admin/src/main/java/com/fzm/mall/server/admin/block_chain/task/SlcRechargeTask.java
View file @ ef38da45
......@@ -289,7 +289,6 @@ public class SlcRechargeTask {
if (txDetail == null) {
continue;
}
log.info("【平行链充值程序】-txDetail:" + txDetail);
// 获取执行器
String execer = txDetail.getExecer();
......
mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/ExternalTokenServiceImpl.java
View file @ ef38da45
......@@ -117,18 +117,29 @@ public class ExternalTokenServiceImpl extends ServiceImpl<ExternalTokenMapper, E
externalToken.setPublishTime(publishTime);
externalToken.setPublisher(publisher);
/*Map<String, Object> map = new HashMap<>();
Map<String, Object> map = new HashMap<>();
map.put("tokenId", tokenId);
String httpGet = HttpUtil.httpGet(url, map);
JSONObject json = JSONObject.parseObject(httpGet);
if (json.getString("code").equals("200")) {
externalToken.setHash(json.getString("data"));
}*/
}
//TODO 唐拓接口
save(externalToken);
}
}
public static void main(String[] args) {
Map<String, Object> map = new HashMap<>();
map.put("tokenId", 1475715277122572288L);
String httpGet = HttpUtil.httpGet("http://146.56.218.121:12100/open/nft/hash", map);
JSONObject json = JSONObject.parseObject(httpGet);
if (json.getString("code").equals("200")) {
System.err.println(json.getString("data"));
}
}
@Override
public ExternalToken queryByLabelNameAndMerchantId(String coin, String merchantId) {
LambdaQueryWrapper<ExternalToken> qw = new LambdaQueryWrapper<>();
......
mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/SkuServiceImpl.java
View file @ ef38da45
......@@ -133,7 +133,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
for (int i = 0; i < kDTO.getStock(); i++) {
String suffix = i + 1 + "";
Long suffixAll = Long.parseLong(tokenId + "00000000".substring(0, 8 - suffix.length()) + suffix);
String hash = chainUtil.evmPublishTokenSplit(merchant.getTokenIssueAddr(), Long.parseLong(tokenId + suffixAll), 1L);
String hash = chainUtil.evmPublishTokenSplit(merchant.getTokenIssueAddr(), suffixAll, 1L);
nos[i] = suffixAll;
hashs[i] = hash;
}
......@@ -309,7 +309,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
for (int i = 0; i < kDTO.getStock(); i++) {
String suffix = i + 1 + "";
Long suffixAll = Long.parseLong(tokenId + "00000000".substring(0, 8 - suffix.length()) + suffix);
String hash = chainUtil.evmPublishTokenSplit(merchant.getTokenIssueAddr(), Long.parseLong(tokenId + suffixAll), 1L);
String hash = chainUtil.evmPublishTokenSplit(merchant.getTokenIssueAddr(), suffixAll, 1L);
nos[i] = suffixAll;
hashs[i] = hash;
}
......
mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/SpuServiceImpl.java
View file @ ef38da45
......@@ -371,7 +371,7 @@ public class SpuServiceImpl extends ServiceImpl<SpuMapper, Spu> implements ISpuS
//TODO banner 推荐商品是否删除
Spu spu = getByGoodsId(goodsId);
if (spu.getCommodityPass().equals(2)) {
if (!spu.getCommodityPass().equals(1)) {
LambdaQueryWrapper<Sku> qw1 = new LambdaQueryWrapper<>();
qw1.eq(Sku::getGoodsId, goodsId);
Sku sku = skuService.getOne(qw1);
......
mall-server-admin/src/main/resources/application-dev.yml
View file @ ef38da45
......@@ -52,14 +52,22 @@ chain:
token-manager: 1N2ABERwHgxGhebVw6fVSwaQ5uLAysmGEu
token-manager-key: 0x4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
para:
rpc-url: http://172.22.20.100:8901
rpc-url: http://146.56.197.42:12021
withhold: 1417K9fd5vt4zYW86xinWiCbAkNP794aNy
withhold-key: 19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
token-manager: 1N2ABERwHgxGhebVw6fVSwaQ5uLAysmGEu
token-manager-key: 4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
title: user.p.nftChain.
cName: user.evm.0x72b80fbf7312e4ddefbfb235754f11915d10b88cefd0e0e96b4d7f66b99cce05
cAddr: 1BzfFBFf99DRhqfunEXhPsZRDgPwUWjab6
token-manager: 1KEBcdmMPfUV2suAqgkyDpdm4brZbYmdfF
token-manager-key: 5d872407fb2769854dcca6203d70696feced7099c588a6d9146a122025585e41
title: user.p.mall.
cName: user.evm.0xb3ae98ac253679602d54d1513aa9cad7d1b10d5f5117d5ce999c1bf67906ba99
cAddr: 15DtbSyS4eVFxdF87jmrcAdXMSAwXEHVLW
# rpc-url: http://172.22.20.100:8901
# withhold: 1417K9fd5vt4zYW86xinWiCbAkNP794aNy
# withhold-key: 19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
# token-manager: 1N2ABERwHgxGhebVw6fVSwaQ5uLAysmGEu
# token-manager-key: 4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
# title: user.p.nftChain.
# cName: user.evm.0x72b80fbf7312e4ddefbfb235754f11915d10b88cefd0e0e96b4d7f66b99cce05
# cAddr: 1BzfFBFf99DRhqfunEXhPsZRDgPwUWjab6
type: para
# 系统账户配置
......@@ -67,7 +75,7 @@ sys:
admin:
addr: 1N2ABERwHgxGhebVw6fVSwaQ5uLAysmGEu
priv-key: 4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
title: user.p.nftChain.
title: user.p.mall.
#支付宝支付配置
......
mall-server-front/src/main/java/com/fzm/mall/server/front/asset/model/vo/asset/UserAssetVo.java
View file @ ef38da45
......@@ -34,4 +34,6 @@ public class UserAssetVo {
@ApiModelProperty(value = "溯源hash")
@TableField(exist = false)
private String hash;
@ApiModelProperty(value = "商品币对于skuId")
private String goodsCoin;
}
mall-server-front/src/main/java/com/fzm/mall/server/front/order/service/impl/OrderServiceImpl.java
View file @ ef38da45
......@@ -340,6 +340,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
for (Object o:array) {
if(index<=orderSkuVo.getNum()){
list.add(o.toString());
index ++;
}else{
break;
}
......@@ -788,7 +789,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
} else {
userAssetService.addCoin(coin.getId(), new BigDecimal(orderDetail.getNumber()));
}
String hash = chainUtil.evmTransfer(user.getAddress(),m.getTokenIssueAddr(),Long.valueOf(orderDetail.getCoin()),orderDetail.getAmount().longValue());
String coinName = orderDetail.getCoin().replace(MALLGlobalConfig.GOODS_NFT_PREFIX, "");
String hash = chainUtil.evmTransfer(user.getAddress(),m.getTokenIssueAddr(),Long.valueOf(coinName),orderDetail.getAmount().longValue());
UserAssetRecord userAssetRecord = new UserAssetRecord();
userAssetRecord.setUid(order.getUid());
userAssetRecord.setAmount(new BigDecimal(orderDetail.getNumber()));
......@@ -836,7 +838,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
UserAssetRecord userAssetRecord = new UserAssetRecord();
userAssetRecord.setUid(order.getUid());
userAssetRecord.setAmount(new BigDecimal(orderDetail.getNumber()));
userAssetRecord.setCoin(orderDetail.getCoin());
userAssetRecord.setCoin(o.toString());
userAssetRecord.setFlowId(OrderUtil.getFlowId());
userAssetRecord.setType(12);
userAssetRecord.setStatus(2);
......@@ -1094,7 +1096,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
UserAssetRecord userAssetRecord = new UserAssetRecord();
userAssetRecord.setUid(order.getUid());
userAssetRecord.setAmount(new BigDecimal(orderDetail.getNumber()));
userAssetRecord.setCoin(orderDetail.getCoin());
userAssetRecord.setCoin(o.toString());
userAssetRecord.setFlowId(OrderUtil.getFlowId());
userAssetRecord.setType(12);
userAssetRecord.setStatus(2);
......
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