Skip to content

M
mall-server
Commit fa88ccc7 authored by wp's avatar wp
Browse files
Options

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

# Conflicts: # mall-server-admin/src/main/java/com/fzm/mall/server/admin/task/order/OrderTask.java
parents fe922d62 9d2b7855
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 17 deletions
mall-server-admin/src/main/java/com/fzm/mall/server/admin/block_chain/nft/NftEvm.java
View file @ fa88ccc7
......@@ -144,6 +144,30 @@ public class NftEvm {
//=============================================================================================
// oid pay_id status coin amount
// 20220118203105uIRfMTVdsckFtPpa2H 20220118203105263208959744302735 1
// 20220118101915XPlkMmVqS9MtkOwGE1 20220118101915790288719351862853 1
// 20220118100611G6DFEGqaOCm5WtqYkR 20220118100611484569303328077251 1
// 20220115105707EBPqGrI942gxVIrWf6 20220115105707221842481006366498 1
// 20220114222820hd7OUHXzSFSsc12K2t 20220114222820289573854028028784 1
// 20220114204244W8zVpMKqwQzNtilsBM 20220114204244595630030375890176 1
// 20220114095345VEXsaD11kPqYsXQ8Yl 20220114095345252269936047485833 1
// 20220113155553EWyYm9G8RQr1UVlj7f 20220113155553494385335129525220 1
// 20220113155544tp8YlcmjYzC8Qqd72i 20220113155544084183984528975273 1
// 20220113135218fvTfkrGTUdCyA4qhuq 20220113135218657274053058216133 1
// 20220112205835K8tPhzmYBYkHfbT0CU 20220112205835604363821385855706 1
// 20220112175111J5mAXNtAecZD4b7TW7 20220112175111743895723255869004 1
// 2022011114111073YsnlUFT3JSEzlQ4i 20220111141110236873418488730693 1
// 20220110170037VIIYi46xoMaIDLqVqJ 20220110170037844620255147496610 1
// 20220110164858FIim8xrJwXdta5jzVL 20220110164858263981305279503196 1
// 20220110164438pp0s9B0tK5X7LmtnWo 20220110164438547660913805483698 1
// 20220105194213e7KijafsxtPWL4LANF 20220105194213641454925484246629 1 164129639500000001 1
// 20220105174220HzSu6dhAM7gI41X0lL 20220105174220891225251100171019 1 1641296392 1
// 20220105174153CVaouFxDPZm3VTfSC8 20220105174153671740652521296427 1 164129639300000001 1
// 202201051637100I8UpE4tSOUXO3YtZI 20220105163710195486453355063315 1 1641365008370 1
// 20220105162303QfnZpNjfzaq306p0Sy 20220105162303481784277443720093 1 1641365008370 1
// 20220105152249tvKSqjXkLkQcPKHuw4 20220105152249723717824780290935 1 1641365008370 1
//30dfdc0977e343a5919b527448a7123f 1Bfv5YPE4zPvSfWab5XSnF3DgCHMfKWEY6
//36ba783ea0394650ac28aa6e71df0784 1Bp1Lc8VepfbuY6fFaUW78LT3YNtGXzyqr
//60e34ef9750542ef9337a33f88d35e46 1LueNdFVXqZ11LHVqN2MBXTSfr7osWSAth
......@@ -174,12 +198,13 @@ public class NftEvm {
// 164129641600000035
// long amount = 1L;
// String hash = ra.evmPublishToken(ymabi, cAddr, EvmTokenEnum.ERC1155, 0L, addr, addr, null, tokenId, amount, "publish", true);
String hash = ra.evmTransfer(ymabi, cAddr, EvmTokenEnum.ERC1155, 0L, "18Yc5VwfsM1DRb5ZCdAU1v3D4C78xB9gKS", 164129641600000035L, 1L, "transfer", "1HXLVUjfchSLwtAnLqStxYqXdhfAk6b1Vg", null, true);
System.err.println(hash);
System.err.println(ra.cycleConfirmTxWithHash(hash, true, 1000).getStatus());
System.err.println(ra.evmBalance(ymabi, cAddr, EvmTokenEnum.ERC1155, "18Yc5VwfsM1DRb5ZCdAU1v3D4C78xB9gKS", 164129641600000035L));
// System.err.println(ra.queryTxWithHash("0xaa66571c1f9be9fbd6d122aaf958c3f26716f9b4c2d5c47e4e2fb4488d9adc7b"));
// String hash = ra.evmTransfer(ymabi, cAddr, EvmTokenEnum.ERC1155, 0L, "18Yc5VwfsM1DRb5ZCdAU1v3D4C78xB9gKS", 164129641600000035L, 1L, "transfer", "1HXLVUjfchSLwtAnLqStxYqXdhfAk6b1Vg", null, true);
// System.err.println(hash);
// System.err.println(ra.cycleConfirmTxWithHash(hash, true, 1000).getStatus());
// System.err.println(ra.evmBalance(ymabi, cAddr, EvmTokenEnum.ERC1155, "1Bp1Lc8VepfbuY6fFaUW78LT3YNtGXzyqr", 1641296393L));
long l = ra.evmBalance(ymabi, cAddr, EvmTokenEnum.ERC1155, "182mR7y2EEnHG9cDpc6ik8xRtkamzeHMHr", 1641296392);
System.err.println(l);
// System.err.println(ra.queryTxWithHash("0xaa66571c1f9be9fbd6d122aaf958c3f26716f9b4c2d5c47e4e2fb4488d9adc7b"));
// System.err.println(ra.evmBalance(ymabi, cAddr, EvmTokenEnum.ERC1155, "1HXLVUjfchSLwtAnLqStxYqXdhfAk6b1Vg", 1643160444340L));
//14SqpwdjFE7moVp5UV7ceUfKynXWt9TKvk 1JcwjaNSnrLJ19j48bNr1YaGz8UGAwYb9N 100 1642991134151L
......
mall-server-admin/src/main/java/com/fzm/mall/server/admin/order/model/Order.java
View file @ fa88ccc7
......@@ -78,6 +78,11 @@ public class Order implements Serializable {
*/
public static final Integer ORDER_STATE_REFUND_FAIL = 13;
/**
* 订单状态，14->订单完成（订单完成n天后关闭）
*/
public static final Integer ORDER_STATE_FINISH_AUTO_CLOSE = 14;
@ApiModelProperty(value = "主键自增编号")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
......@@ -109,7 +114,8 @@ public class Order implements Serializable {
@ApiModelProperty(value = "1.普通 2.预售 3.拍卖")
private Integer orderType;
@ApiModelProperty(value = "订单状态，1->交易成功，2->交易关闭，3->定金已付，4->待退款，5->已退款，6->支付中，7->待支付 ,8 撤销退款, 9->退款驳回, 10 待付尾款 11->链上退款失败 12->退款中 13->退款失败")
@ApiModelProperty(value = "订单状态，1->交易成功，2->交易关闭，3->定金已付，4->待退款，5->已退款，6->支付中，7->待支付 ,8 撤销退款," +
" 9->退款驳回, 10 待付尾款 11->链上退款失败 12->退款中 13->退款失败 14->交易结束")
private Integer orderState;
@ApiModelProperty(value = "是否直接提货，0->否，1->是")
......
mall-server-admin/src/main/java/com/fzm/mall/server/admin/task/order/OrderTask.java
View file @ fa88ccc7
......@@ -215,7 +215,7 @@ public class OrderTask {
for (Order order : orderList) {
long time = order.getUpdateTime() + config.getDealCloseLimit() * 24 * 60 * 60 * 1000;
if (System.currentTimeMillis() > time) {
order.setOrderState(Order.ORDER_STATE_CLOSED);
order.setOrderState(Order.ORDER_STATE_FINISH_AUTO_CLOSE);
orderService.updateById(order);
}
}
......
mall-server-front/src/main/java/com/fzm/mall/server/front/mq/consumer/orderCloseCousumer.java
View file @ fa88ccc7
......@@ -49,4 +49,5 @@ public class orderCloseCousumer {
pay.setState(2);
payService.updateById(pay);
}
}
mall-server-front/src/main/java/com/fzm/mall/server/front/order/model/Order.java
View file @ fa88ccc7
......@@ -60,7 +60,8 @@ public class Order implements Serializable {
@ApiModelProperty(value = "1.普通 2.预售 3.拍卖")
private Integer orderType;
@ApiModelProperty(value = "订单状态，1->交易成功，2->交易关闭，3->定金已付，4->待退款，5->已退款，6->支付中，7->待支付")
@ApiModelProperty(value = "订单状态，1->交易成功，2->交易关闭，3->定金已付，4->待退款，5->已退款，6->支付中，7->待支付 ,8 撤销退款," +
" 9->退款驳回, 10 待付尾款 11->链上退款失败 12->退款中 13->退款失败 14->交易结束")
private Integer orderState;
@ApiModelProperty(value = "是否直接提货，0->否，1->是")
......
mall-server-front/src/main/java/com/fzm/mall/server/front/order/service/impl/OrderServiceImpl.java
View file @ fa88ccc7
......@@ -38,6 +38,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fzm.mall.server.front.redis.OrderRedis;
import com.fzm.mall.server.front.repository.RedisRepository;
import com.fzm.mall.server.front.user.model.User;
import com.fzm.mall.server.front.user.service.IRedisService;
import com.fzm.mall.server.front.user.service.IUserService;
import com.fzm.mall.server.front.util.ChainUtil;
import com.fzm.mall.server.front.util.OrderUtil;
......@@ -96,6 +97,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
private final IUserService userService;
private final INftService nftService;
private final ISpuService ispuService;
private final IRedisService redisService;
@Autowired
private ChainUtil chainUtil;
......@@ -331,6 +333,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
if(commodity == 3){
int saleType = spuService.getNftSalesType(orderSkuVo.getSkuId());
if(saleType == 2){
while (!redisService.setNx("select"+skuVo.getCommodityPassId())){
}
String serialNo = skuService.getSerialNo(skuVo.getCommodityPassId());
List<Long> array = JSON.parseArray(serialNo, Long.class);
if(array.size()<orderSkuVo.getNum()){
......@@ -348,6 +353,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
}
boolean remove = array.removeAll(list);
skuService.updateSerialNo(JSON.toJSONString(array),skuVo.getCommodityPassId());
redisService.del("select"+skuVo.getCommodityPassId());
orderDetail.setSerialNo(JSON.toJSONString(list));
}
}
......@@ -827,7 +833,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
if (coin == null) {
coin = new UserAsset();
coin.setCoin(o.toString());
coin.setAmount(new BigDecimal(orderDetail.getNumber()));
coin.setAmount(new BigDecimal(1));
coin.setUid(order.getUid());
coin.setType(1);
coin.setGoodsCoin(orderDetail.getCoin());
......@@ -846,8 +852,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
userAssetRecord.setNote(order.getOid());
userAssetRecordService.save(userAssetRecord);
//加销量
countService.addSale(orderDetail.getGoodsId(), orderDetail.getNumber());
goodSkuService.addSales(orderDetail.getSkuId(), orderDetail.getNumber());
countService.addSale(orderDetail.getGoodsId(), 1);
goodSkuService.addSales(orderDetail.getSkuId(), 1);
//转币
TranDto tranDto = new TranDto();
tranDto.setId(userAssetRecord.getId());
......@@ -1086,7 +1092,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
if (coin == null) {
coin = new UserAsset();
coin.setCoin(o.toString());
coin.setAmount(new BigDecimal(orderDetail.getNumber()));
coin.setAmount(new BigDecimal(1));
coin.setUid(order.getUid());
coin.setType(1);
coin.setGoodsCoin(orderDetail.getCoin());
......@@ -1105,8 +1111,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
userAssetRecord.setNote(order.getOid());
userAssetRecordService.save(userAssetRecord);
//加销量
countService.addSale(orderDetail.getGoodsId(), orderDetail.getNumber());
goodSkuService.addSales(orderDetail.getSkuId(), orderDetail.getNumber());
countService.addSale(orderDetail.getGoodsId(), 1);
goodSkuService.addSales(orderDetail.getSkuId(), 1);
//转币
TranDto tranDto = new TranDto();
tranDto.setId(userAssetRecord.getId());
......
mall-server-front/src/main/java/com/fzm/mall/server/front/util/ChainUtil.java
View file @ fa88ccc7
This source diff could not be displayed because it is too large. You can view the blob instead.
mall-sql/mall_create.sql
View file @ fa88ccc7
......@@ -2522,5 +2522,4 @@ ALTER TABLE `order_detail`
ADD COLUMN `goods_coin` VARCHAR(32) NOT NULL DEFAULT '0' COMMENT '商品coin' ;
update user_asset set goods_coin = coin;
ALTER TABLE `user_asset_record` ADD COLUMN `goods_coin` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '商品coin';
\ No newline at end of file
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