Merge branch 'dev' into 'test'

mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/SkuServiceImpl.java

@@ -150,7 +150,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
                     //发行NFT
                     ExternalToken externalToken = externalTokenService.queryByLabelNameAndMerchantId(kDTO.getCoinName(), merchantId);
 
-                    String tokenId = externalToken.getTokenId().toString();
+                    /*String tokenId = externalToken.getTokenId().toString();
                     long[] nos = new long[Math.toIntExact(kDTO.getStock())];
                     String[] hashs = new String[Math.toIntExact(kDTO.getStock())];
                     for (int i = 0; i < kDTO.getStock(); i++) {
@@ -159,15 +159,17 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
                         String hash = chainUtil.evmPublishTokenSplit(addr, suffixAll, 1L);
                         nos[i] = suffixAll;
                         hashs[i] = hash;
-                    }
+                    }*/
 
                     Map<String, Object> map = new HashMap<>();
                     map.put("goodsId", goodsId);
-                    map.put("hashs", hashs);
-                    map.put("prefix", tokenId);
+//                    map.put("hashs", hashs);
+                    map.put("prefix", externalToken.getTokenId().toString());
                     map.put("merchantId", merchantId);
                     map.put("commodityPassId", externalToken.getCommodityPassId());
-                    map.put("nos", JSONArray.toJSON(nos));
+//                    map.put("nos", JSONArray.toJSON(nos));
+                    map.put("stock",kDTO.getStock());
+                    map.put("addr",addr);
                     producer.sendTTL(map, QueueTTLTypeEnum.NFT_USU_TTL, 10 * 1000);
                 }
             }

mall-server-admin/src/main/java/com/fzm/mall/server/admin/mq/consumer/goods_center/NftConsumer.java

@@ -60,13 +60,26 @@ public class NftConsumer {
     public void usuCoinsPrice(Map<String, Object> obj) {
         try {
             String goodsId = obj.get("goodsId") + "";
-            String[] hashs = (String[]) obj.get("hashs");
+//            String[] hashs = (String[]) obj.get("hashs");
             String prefix = obj.get("prefix") + "";
-            String nos = obj.get("nos") + "";
+//            String nos = obj.get("nos") + "";
             String merchantId = obj.get("merchantId") + "";
             String commodityPassId = obj.get("commodityPassId") + "";
+//            String tokenId = obj.get("tokenId") + "";
+            Long stock = (Long) obj.get("stock");
+            String addr = obj.get("addr") + "";
             System.err.println("obj:" + obj);
 
+            long[] nos = new long[Math.toIntExact(stock)];
+            String[] hashs = new String[Math.toIntExact(stock)];
+            for (int i = 0; i < stock; i++) {
+                String suffix = i + 1 + "";
+                Long suffixAll = Long.parseLong(prefix + "00000000".substring(0, 8 - suffix.length()) + suffix);
+                String hash = chainUtil.evmPublishTokenSplit(addr, suffixAll, 1L);
+                nos[i] = suffixAll;
+                hashs[i] = hash;
+            }
+
             int length = hashs.length;
 
             //发行token