Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mall-server
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yimu
mall-server
Commits
f1865d72
Commit
f1865d72
authored
Dec 27, 2021
by
秦兴亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
最新代码
parent
5d85b2b6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
63 additions
and
0 deletions
+63
-0
UserAsset.java
...java/com/fzm/mall/server/front/asset/model/UserAsset.java
+4
-0
GoodSpuMapper.java
...com/fzm/mall/server/front/goods/mapper/GoodSpuMapper.java
+3
-0
SkuMapper.java
...ava/com/fzm/mall/server/front/goods/mapper/SkuMapper.java
+11
-0
SkuVo.java
.../java/com/fzm/mall/server/front/goods/model/vo/SkuVo.java
+2
-0
IGoodSpuService.java
.../fzm/mall/server/front/goods/service/IGoodSpuService.java
+2
-0
ISkuService.java
.../com/fzm/mall/server/front/goods/service/ISkuService.java
+7
-0
GoodSpuServiceImpl.java
...l/server/front/goods/service/impl/GoodSpuServiceImpl.java
+5
-0
SkuServiceImpl.java
.../mall/server/front/goods/service/impl/SkuServiceImpl.java
+16
-0
Delivery.java
.../java/com/fzm/mall/server/front/order/model/Delivery.java
+2
-0
OrderDetail.java
...va/com/fzm/mall/server/front/order/model/OrderDetail.java
+2
-0
OrderServiceImpl.java
...all/server/front/order/service/impl/OrderServiceImpl.java
+0
-0
mall_create.sql
mall-sql/mall_create.sql
+9
-0
No files found.
mall-server-front/src/main/java/com/fzm/mall/server/front/asset/model/UserAsset.java
View file @
f1865d72
...
...
@@ -62,4 +62,8 @@ public class UserAsset implements Serializable {
@ApiModelProperty
(
value
=
"库存总价"
)
@TableField
(
exist
=
false
)
private
BigDecimal
totalPrice
;
@ApiModelProperty
(
value
=
"商品币对于skuId"
)
private
String
goodsCoin
;
}
mall-server-front/src/main/java/com/fzm/mall/server/front/goods/mapper/GoodSpuMapper.java
View file @
f1865d72
...
...
@@ -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
View file @
f1865d72
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
View file @
f1865d72
...
...
@@ -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
View file @
f1865d72
...
...
@@ -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
View file @
f1865d72
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
View file @
f1865d72
...
...
@@ -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
View file @
f1865d72
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
View file @
f1865d72
...
...
@@ -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
View file @
f1865d72
...
...
@@ -88,4 +88,6 @@ public class OrderDetail implements Serializable {
@ApiModelProperty
(
value
=
"店铺名称"
)
@TableField
(
exist
=
false
)
private
String
shopName
;
private
String
serialNo
;
}
mall-server-front/src/main/java/com/fzm/mall/server/front/order/service/impl/OrderServiceImpl.java
View file @
f1865d72
This diff is collapsed.
Click to expand it.
mall-sql/mall_create.sql
View file @
f1865d72
...
...
@@ -2482,3 +2482,11 @@ ALTER TABLE `goods_spu`
ALTER
TABLE
`opration_function`
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment