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

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

@@ -63,7 +63,14 @@ public class UserAsset implements Serializable {
     @TableField(exist = false)
     private BigDecimal totalPrice;
 
+
+    @ApiModelProperty(value = "商品币对于skuId")
+    private String goodsCoin;
+
     @ApiModelProperty(value = "溯源hash")
     @TableField(exist = false)
     private String hash;
+
+    @ApiModelProperty(value = "商品coin")
+    private String goodsCoin;
 }

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);

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/mapper/GoodSpuMapper.java

@@ -23,4 +23,7 @@ public interface GoodSpuMapper extends BaseMapper<GoodSpu> {
 
     @Select("select a.commodity_pass from goods_spu a left join goods_sku b on a.goods_id = b.goods_id where b.sku_id = #{skuId} ")
     int getCommodityBySkuId(@Param("skuId") String skuId);
+
+    @Select("select nft_sales_type from  goods_sku  where sku_id = #{skuId} ")
+    int getNftSalesType(@Param("skuId") String skuId);
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/mapper/SkuMapper.java

 package com.fzm.mall.server.front.goods.mapper;
 
+import com.alibaba.fastjson.JSON;
 import com.fzm.mall.server.front.goods.model.Sku;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fzm.mall.server.front.goods.model.vo.SkuVo;
 import com.fzm.mall.server.front.order.model.vo.ShopInfoVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -38,4 +40,13 @@ public interface SkuMapper extends BaseMapper<Sku> {
 
     @Select("select token_id from external_token where label_name = #{coin} limit 1")
     Long getTrueCoin(@Param("coin") String coin);
+
+    @Select("select  token_id from goods_sku a left join  external_token b on a.commodity_pass_id = b.commodity_pass_id where a.sku_id = #{skuId}")
+    Long getTokenId(@Param("skuId") String skuId);
+
+    @Select("select serial_no from goods_sku_usufruct where commodity_pass_id = #{commodity_pass_id}")
+    String getSerialNo(@Param("commodity_pass_id") String tokenId);
+
+    @Update("update goods_sku_usufruct set serial_no = #{toJSONString} where commodity_pass_id = #{commodityPassId}")
+    void updateSerialNo(@Param("toJSONString") String toJSONString, @Param("commodityPassId") String commodityPassId);
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/model/vo/SkuVo.java

@@ -64,4 +64,6 @@ public class SkuVo {
 
     private Integer type;
 
+    private  String commodityPassId;
+
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/service/IGoodSpuService.java

@@ -17,4 +17,6 @@ public interface IGoodSpuService extends IService<GoodSpu> {
     String getTemplateIdByGoodsId(String goodsId);
 
     int getCommodityBySkuId(String skuId);
+
+    int getNftSalesType(String skuId);
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/service/ISkuService.java

 package com.fzm.mall.server.front.goods.service;
 
+import com.alibaba.fastjson.JSON;
 import com.fzm.mall.server.front.goods.model.Sku;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fzm.mall.server.front.goods.model.vo.SkuVo;
@@ -34,4 +35,10 @@ public interface ISkuService extends IService<Sku> {
     Boolean checkOrder(OrderVo orderVo);
 
     Long getTrueCoin(String coin);
+
+    Long getTokenId(String skuId);
+
+    String getSerialNo(String tokenId);
+
+    void updateSerialNo(String toJSONString,String commodityPassId);
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/service/impl/GoodSpuServiceImpl.java

@@ -54,4 +54,9 @@ public class GoodSpuServiceImpl extends ServiceImpl<GoodSpuMapper, GoodSpu> impl
         return goodSpuMapper.getCommodityBySkuId(skuId);
     }
 
+    @Override
+    public int getNftSalesType(String skuId) {
+        return goodSpuMapper.getNftSalesType(skuId);
+    }
+
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/goods/service/impl/SkuServiceImpl.java

 package com.fzm.mall.server.front.goods.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fzm.mall.server.front.goods.model.Sku;
@@ -80,6 +81,21 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
         return skuMapper.getTrueCoin(coin);
     }
 
+    @Override
+    public Long getTokenId(String skuId) {
+        return skuMapper.getTokenId(skuId);
+    }
+
+    @Override
+    public String getSerialNo(String tokenId) {
+        return skuMapper.getSerialNo(tokenId);
+    }
+
+    @Override
+    public void updateSerialNo(String toJSONString,String commodityPassId) {
+        skuMapper.updateSerialNo(toJSONString,commodityPassId);
+    }
+
     private boolean checkMerchantIdAndSkuId(String merchantId, String skuId) {
         SkuVo skuVo = skuMapper.getBySkuId(skuId);
         if (merchantId.equals(skuVo.getMerchantId())) {

mall-server-front/src/main/java/com/fzm/mall/server/front/order/model/Delivery.java

@@ -107,4 +107,6 @@ public class Delivery implements Serializable {
     @ApiModelProperty(value = "邮费")
     private BigDecimal postFee;
 
+    private String serialNo;
+
 }

mall-server-front/src/main/java/com/fzm/mall/server/front/order/model/OrderDetail.java

@@ -88,4 +88,6 @@ public class OrderDetail implements Serializable {
     @ApiModelProperty(value = "店铺名称")
     @TableField(exist = false)
     private String shopName;
+
+    private String serialNo;
 }

mall-sql/mall_create.sql

@@ -2514,3 +2514,12 @@ CREATE TABLE `goods_sku_usufruct` (
                                       PRIMARY KEY (`id`) USING BTREE
 
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='使用权';
+    ADD COLUMN `param` varchar(500) NOT NULL DEFAULT '' COMMENT '功能区跳转参数';
+	
+ALTER TABLE `order_detail`
+ ADD COLUMN `serial_no` JSON NULL DEFAULT NULL COMMENT '序列号' ;
+ 
+ ALTER TABLE `user_asset`
+	ADD COLUMN `goods_coin` VARCHAR(32) NOT NULL DEFAULT '0' COMMENT '商品coin' ;
+	
+update user_asset set goods_coin = coin;
\ No newline at end of file