Commit f1865d72 authored by 秦兴亮's avatar 秦兴亮

最新代码

parent 5d85b2b6
...@@ -62,4 +62,8 @@ public class UserAsset implements Serializable { ...@@ -62,4 +62,8 @@ public class UserAsset implements Serializable {
@ApiModelProperty(value = "库存总价") @ApiModelProperty(value = "库存总价")
@TableField(exist = false) @TableField(exist = false)
private BigDecimal totalPrice; private BigDecimal totalPrice;
@ApiModelProperty(value = "商品币对于skuId")
private String goodsCoin;
} }
...@@ -23,4 +23,7 @@ public interface GoodSpuMapper extends BaseMapper<GoodSpu> { ...@@ -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} ") @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); int getCommodityBySkuId(@Param("skuId") String skuId);
@Select("select nft_sales_type from goods_sku where sku_id = #{skuId} ")
int getNftSalesType(@Param("skuId") String skuId);
} }
package com.fzm.mall.server.front.goods.mapper; package com.fzm.mall.server.front.goods.mapper;
import com.alibaba.fastjson.JSON;
import com.fzm.mall.server.front.goods.model.Sku; import com.fzm.mall.server.front.goods.model.Sku;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzm.mall.server.front.goods.model.vo.SkuVo; import com.fzm.mall.server.front.goods.model.vo.SkuVo;
import com.fzm.mall.server.front.order.model.vo.ShopInfoVo; import com.fzm.mall.server.front.order.model.vo.ShopInfoVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List; import java.util.List;
...@@ -38,4 +40,13 @@ public interface SkuMapper extends BaseMapper<Sku> { ...@@ -38,4 +40,13 @@ public interface SkuMapper extends BaseMapper<Sku> {
@Select("select token_id from external_token where label_name = #{coin} limit 1") @Select("select token_id from external_token where label_name = #{coin} limit 1")
Long getTrueCoin(@Param("coin") String coin); 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);
} }
...@@ -64,4 +64,6 @@ public class SkuVo { ...@@ -64,4 +64,6 @@ public class SkuVo {
private Integer type; private Integer type;
private String commodityPassId;
} }
...@@ -17,4 +17,6 @@ public interface IGoodSpuService extends IService<GoodSpu> { ...@@ -17,4 +17,6 @@ public interface IGoodSpuService extends IService<GoodSpu> {
String getTemplateIdByGoodsId(String goodsId); String getTemplateIdByGoodsId(String goodsId);
int getCommodityBySkuId(String skuId); int getCommodityBySkuId(String skuId);
int getNftSalesType(String skuId);
} }
package com.fzm.mall.server.front.goods.service; package com.fzm.mall.server.front.goods.service;
import com.alibaba.fastjson.JSON;
import com.fzm.mall.server.front.goods.model.Sku; import com.fzm.mall.server.front.goods.model.Sku;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.fzm.mall.server.front.goods.model.vo.SkuVo; import com.fzm.mall.server.front.goods.model.vo.SkuVo;
...@@ -34,4 +35,10 @@ public interface ISkuService extends IService<Sku> { ...@@ -34,4 +35,10 @@ public interface ISkuService extends IService<Sku> {
Boolean checkOrder(OrderVo orderVo); Boolean checkOrder(OrderVo orderVo);
Long getTrueCoin(String coin); Long getTrueCoin(String coin);
Long getTokenId(String skuId);
String getSerialNo(String tokenId);
void updateSerialNo(String toJSONString,String commodityPassId);
} }
...@@ -54,4 +54,9 @@ public class GoodSpuServiceImpl extends ServiceImpl<GoodSpuMapper, GoodSpu> impl ...@@ -54,4 +54,9 @@ public class GoodSpuServiceImpl extends ServiceImpl<GoodSpuMapper, GoodSpu> impl
return goodSpuMapper.getCommodityBySkuId(skuId); return goodSpuMapper.getCommodityBySkuId(skuId);
} }
@Override
public int getNftSalesType(String skuId) {
return goodSpuMapper.getNftSalesType(skuId);
}
} }
package com.fzm.mall.server.front.goods.service.impl; 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.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzm.mall.server.front.goods.model.Sku; import com.fzm.mall.server.front.goods.model.Sku;
...@@ -80,6 +81,21 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS ...@@ -80,6 +81,21 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
return skuMapper.getTrueCoin(coin); 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) { private boolean checkMerchantIdAndSkuId(String merchantId, String skuId) {
SkuVo skuVo = skuMapper.getBySkuId(skuId); SkuVo skuVo = skuMapper.getBySkuId(skuId);
if(merchantId.equals(skuVo.getMerchantId())){ if(merchantId.equals(skuVo.getMerchantId())){
......
...@@ -107,4 +107,6 @@ public class Delivery implements Serializable { ...@@ -107,4 +107,6 @@ public class Delivery implements Serializable {
@ApiModelProperty(value = "邮费") @ApiModelProperty(value = "邮费")
private BigDecimal postFee; private BigDecimal postFee;
private String serialNo;
} }
...@@ -88,4 +88,6 @@ public class OrderDetail implements Serializable { ...@@ -88,4 +88,6 @@ public class OrderDetail implements Serializable {
@ApiModelProperty(value = "店铺名称") @ApiModelProperty(value = "店铺名称")
@TableField(exist = false) @TableField(exist = false)
private String shopName; private String shopName;
private String serialNo;
} }
...@@ -2481,4 +2481,12 @@ ALTER TABLE `goods_spu` ...@@ -2481,4 +2481,12 @@ ALTER TABLE `goods_spu`
ADD COLUMN `hash` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通邦nfthash', AFTER `nft_file`; ADD COLUMN `hash` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通邦nfthash', AFTER `nft_file`;
ALTER TABLE `opration_function` ALTER TABLE `opration_function`
ADD COLUMN `param` varchar(500) NOT NULL DEFAULT '' COMMENT '功能区跳转参数'; ADD COLUMN `param` varchar(500) NOT NULL DEFAULT '' COMMENT '功能区跳转参数';
\ No newline at end of file
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
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