最新代码

mall-server-front/src/main/java/com/fzm/mall/server/front/order/service/impl/OrderServiceImpl.java

@@ -42,6 +42,7 @@ 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;
 import com.fzm.mall.server.front.util.TimeUtil;
+import io.netty.util.internal.StringUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1179,10 +1180,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             List<Long> noList = JSON.parseArray(no, Long.class);
             SkuVo skuVo = goodSkuService.getSkuVoBySkuId(orderDetail.getSkuId());
             String serialNo = skuService.getSerialNo(skuVo.getCommodityPassId());
-            List<Long> serialNoList = JSON.parseArray(serialNo, Long.class);
-            serialNoList.addAll(noList);
-            Collections.sort(serialNoList);
-            skuService.updateSerialNo(JSON.toJSONString(serialNoList),skuVo.getCommodityPassId());
+            if(!StringUtil.isNullOrEmpty(serialNo)){
+                List<Long> serialNoList = JSON.parseArray(serialNo, Long.class);
+                serialNoList.addAll(noList);
+                Collections.sort(serialNoList);
+                skuService.updateSerialNo(JSON.toJSONString(serialNoList),skuVo.getCommodityPassId());
+            }
+
         }
     }
 

mall-server-front/src/main/java/com/fzm/mall/server/front/util/ChainUtil.java

@@ -134,11 +134,11 @@ public class ChainUtil {
         String hash = null;
         switch (Objects.requireNonNull(ChainTypeEnum.getByType(type))) {
             case MAIN:
-                hash = mainClient.evmTransfer(abi, cAddr, EvmTokenEnum.ERC1155, 0L, to, tokenId, amount,
+                hash = mainClient.evmTransfer(abi, cAddr, EvmTokenEnum.ERC1155, 1000000L, to, tokenId, amount,
                         "transfer", publisher, null, false);
                 break;
             case PARA:
-                hash = paraClient.evmTransfer(abi, cAddr, EvmTokenEnum.ERC1155, 0L, to, tokenId, amount,
+                hash = paraClient.evmTransfer(abi, cAddr, EvmTokenEnum.ERC1155, 1000000L, to, tokenId, amount,
                         "transfer", publisher, null, true);
                 break;
         }