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

mall-server-admin/src/main/java/com/fzm/mall/server/admin/block_chain/task/SlcRechargeTask.java

@@ -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/entity/dto/CategorySaveDTO.java

@@ -36,7 +36,6 @@ public class CategorySaveDTO implements Serializable {
     private String name;
 
     @ApiModelProperty(value = "缩略图")
-    @NotBlank(message = MallResponseError.NULL_PARAM_ERROR)
     private String thumb;
 
 }

mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/entity/dto/CategoryUpdateDTO.java

@@ -22,7 +22,7 @@ public class CategoryUpdateDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "系列编号")
+    @ApiModelProperty(value = "系列编号", required = true)
     @NotBlank(message = MallResponseError.NULL_PARAM_ERROR)
     private String categoryId;
 
@@ -31,7 +31,6 @@ public class CategoryUpdateDTO implements Serializable {
     private String name;
 
     @ApiModelProperty(value = "缩略图")
-    @NotBlank(message = MallResponseError.NULL_PARAM_ERROR)
     private String thumb;
 
     @ApiModelProperty(value = "信息更新时间", required = true)

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

@@ -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

@@ -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/resources/application-dev.yml

@@ -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/UserAssetRecord.java

@@ -72,6 +72,9 @@ public class UserAssetRecord implements Serializable {
     @ApiModelProperty(value = "备注")
     private String note;
 
+    @ApiModelProperty(value = "商品coin")
+    private String goodsCoin;
+
     public void init(String uid, String coin, Integer type, BigDecimal amount, Integer status, String otherSide, String hash, String note) {
         setFlowId(UUIdUtil.getUUID());
         setUid(uid);

mall-server-front/src/main/java/com/fzm/mall/server/front/asset/model/dto/AssetTranDTO.java

@@ -35,5 +35,6 @@ public class AssetTranDTO {
 
     public AssetTranDTO() {
     }
-
+    @ApiModelProperty(value = "商品coin")
+    private String goodsCoin;
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/asset/service/impl/UserAssetServiceImpl.java

@@ -97,10 +97,10 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset
             BigDecimal amount = i.getAmount();
             i.setAmount(amount.setScale(2, BigDecimal.ROUND_DOWN));
             i.setFrozen(i.getFrozen().setScale(2, BigDecimal.ROUND_DOWN));
-            if (StringUtil.isNullOrEmpty(i.getCoin())) {
+            if (StringUtil.isNullOrEmpty(i.getGoodsCoin())) {
                 continue;
             }
-            SkuVo skuVo = skuService.querySkuByCoin(i.getCoin());
+            SkuVo skuVo = skuService.querySkuByCoin(i.getGoodsCoin());
             if (skuVo != null) {
                 BigDecimal totalPrice = amount.multiply(skuVo.getOriginalPrice()).setScale(2, BigDecimal.ROUND_DOWN);
                 i.setTotalPrice(totalPrice);