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
2f0e41b2
Commit
2f0e41b2
authored
Mar 07, 2022
by
wangpeng
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into 'test'
Dev See merge request
!3
parents
ee22b299
9c6b83b6
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
8 deletions
+19
-8
pom.xml
mall-server-admin/pom.xml
+1
-1
NftEvm.java
...ava/com/fzm/mall/server/admin/block_chain/nft/NftEvm.java
+1
-1
ISkuService.java
...m/mall/server/admin/goods_center/service/ISkuService.java
+2
-1
SkuServiceImpl.java
...erver/admin/goods_center/service/impl/SkuServiceImpl.java
+8
-1
SpuServiceImpl.java
...erver/admin/goods_center/service/impl/SpuServiceImpl.java
+5
-2
pom.xml
mall-server-front/pom.xml
+1
-1
mall_create.sql
mall-sql/mall_create.sql
+1
-1
No files found.
mall-server-admin/pom.xml
View file @
2f0e41b2
...
...
@@ -155,7 +155,7 @@
<id>
aliyun
</id>
<name>
aliyun repositories
</name>
<layout>
default
</layout>
<url>
http://1
46.56.197.85
:12100/repository/maven-public/
</url>
<url>
http://1
16.63.133.8
:12100/repository/maven-public/
</url>
</repository>
</repositories>
...
...
mall-server-admin/src/main/java/com/fzm/mall/server/admin/block_chain/nft/NftEvm.java
View file @
2f0e41b2
...
...
@@ -212,7 +212,7 @@ public class NftEvm {
//// String hash = ra.evmPublishToken(ymabi, cAddr, EvmTokenEnum.ERC1155, 0L, addr, addr, null, tokenId, amount, "publish", true);
// String hash = ra.evmTransfer(ymabi, cAddr, EvmTokenEnum.ERC1155, 0L, "1Pm586wYpAyuGhBRTzeWSR2TNW6AjukZiS", 164129641600000002L, 1L, "transfer", "1HXLVUjfchSLwtAnLqStxYqXdhfAk6b1Vg", null, true);
// System.err.println(hash);
System
.
err
.
println
(
ra
.
cycleConfirmTxWithHash
(
"0x
27ca69fd572dfdda7a459344f484774fdcd630677caaa5970dc230560122df0
8"
,
true
,
1000
).
getStatus
());
System
.
err
.
println
(
ra
.
cycleConfirmTxWithHash
(
"0x
e70427cdcc7819bbbe818d7b5d19648edc3e34596d7a32b4dd6da5676498c21
8"
,
true
,
1000
).
getStatus
());
// System.err.println(ra.evmBalance(ymabi, cAddr, EvmTokenEnum.ERC1155, "1Pm586wYpAyuGhBRTzeWSR2TNW6AjukZiS", 164129641600000002L));
// long l = ra.evmBalance(ymabi, cAddr, EvmTokenEnum.ERC1155, "182mR7y2EEnHG9cDpc6ik8xRtkamzeHMHr", 1641296392);
// System.err.println(l);
...
...
mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/ISkuService.java
View file @
2f0e41b2
...
...
@@ -7,6 +7,7 @@ import com.fzm.mall.server.admin.goods_center.entity.vo.GoodsSkuVO;
import
com.fzm.mall.server.admin.goods_center.model.Sku
;
import
com.fzm.mall.server.admin.order.model.OrderDetail
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -27,7 +28,7 @@ public interface ISkuService extends IService<Sku> {
* @param merchantId 商户id
* @param commodityPass 商品通证
*/
void
add
(
List
<
GoodsSkuDTO
>
kDTOs
,
String
goodsId
,
String
goodsName
,
String
merchantId
,
String
addr
,
Integer
commodityPass
,
String
thumb
,
Integer
pDTOType
,
Integer
salesType
);
void
add
(
List
<
GoodsSkuDTO
>
kDTOs
,
String
goodsId
,
String
goodsName
,
String
merchantId
,
String
addr
,
Integer
commodityPass
,
String
thumb
,
Integer
pDTOType
,
Integer
salesType
,
BigDecimal
blindBoxPrice
);
/**
* 新增商品规格
...
...
mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/SkuServiceImpl.java
View file @
2f0e41b2
...
...
@@ -71,7 +71,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
private
ChainUtil
chainUtil
;
@Override
public
void
add
(
List
<
GoodsSkuDTO
>
kDTOs
,
String
goodsId
,
String
goodsName
,
String
merchantId
,
String
addr
,
Integer
commodityPass
,
String
thumb
,
Integer
pDTOType
,
Integer
salesType
)
{
public
void
add
(
List
<
GoodsSkuDTO
>
kDTOs
,
String
goodsId
,
String
goodsName
,
String
merchantId
,
String
addr
,
Integer
commodityPass
,
String
thumb
,
Integer
pDTOType
,
Integer
salesType
,
BigDecimal
blindBoxPrice
)
{
List
<
Sku
>
skus
=
new
ArrayList
<>();
int
total
=
kDTOs
.
size
();
int
subCount
=
0
;
...
...
@@ -84,9 +84,16 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements ISkuS
if
(
StringUtils
.
isBlank
(
kDTO
.
getImage
()))
{
sku
.
setThumb
(
thumb
);
}
if
(
salesType
.
equals
(
SalesTypeEnum
.
ORDINARY
.
getType
()))
{
sku
.
setCirculation
(
kDTO
.
getStock
());
}
if
(
salesType
.
equals
(
SalesTypeEnum
.
BLIND_BOX
.
getType
()))
{
sku
.
setOriginalPrice
(
blindBoxPrice
);
}
sku
.
setSkuId
(
skuId
);
sku
.
setGoodsId
(
goodsId
);
//规格属性入库
skuPropService
.
add
(
kDTO
.
getPropertyList
(),
skuId
);
...
...
mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/SpuServiceImpl.java
View file @
2f0e41b2
...
...
@@ -113,7 +113,10 @@ public class SpuServiceImpl extends ServiceImpl<SpuMapper, Spu> implements ISpuS
if
(
pDTO
.
getSalesType
().
equals
(
SalesTypeEnum
.
ORDINARY
.
getType
()))
{
nftService
.
add
(
pDTO
.
getNftdto
(),
goodsId
,
pDTO
.
getName
(),
addr
,
merchantId
,
timestamp
);
if
(
pDTO
.
getNftdto
().
getTzType
().
equals
(
1
))
{
List
<
GoodsSkuDTO
>
objects
=
pDTO
.
getSkuList
().
stream
().
peek
(
v
->
v
.
setCoinName
(
MALLGlobalConfig
.
NFT_PREFIX
+
timestamp
)).
collect
(
Collectors
.
toList
());
List
<
GoodsSkuDTO
>
objects
=
pDTO
.
getSkuList
().
stream
().
peek
(
v
->
{
v
.
setCoinName
(
MALLGlobalConfig
.
NFT_PREFIX
+
timestamp
);
v
.
setStock
(
pDTO
.
getNftdto
().
getNumber
());
}).
collect
(
Collectors
.
toList
());
pDTO
.
setSkuList
(
objects
);
}
}
...
...
@@ -123,7 +126,7 @@ public class SpuServiceImpl extends ServiceImpl<SpuMapper, Spu> implements ISpuS
categorySpuService
.
add
(
ids
,
goodsId
,
merchantId
);
//商品规格入库
skuService
.
add
(
pDTO
.
getSkuList
(),
goodsId
,
pDTO
.
getName
(),
merchantId
,
addr
,
pDTO
.
getCommodityPass
(),
pDTO
.
getThumb
(),
pDTOType
,
pDTO
.
getSalesType
());
skuService
.
add
(
pDTO
.
getSkuList
(),
goodsId
,
pDTO
.
getName
(),
merchantId
,
addr
,
pDTO
.
getCommodityPass
(),
pDTO
.
getThumb
(),
pDTOType
,
pDTO
.
getSalesType
()
,
pDTO
.
getBlindBoxPrice
()
);
//初始化商品信息
spu
=
beanMapper
.
map
(
pDTO
,
Spu
.
class
);
...
...
mall-server-front/pom.xml
View file @
2f0e41b2
...
...
@@ -131,7 +131,7 @@
<id>
aliyun
</id>
<name>
aliyun repositories
</name>
<layout>
default
</layout>
<url>
http://1
46.56.197.85
:12100/repository/maven-public/
</url>
<url>
http://1
16.63.133.8
:12100/repository/maven-public/
</url>
</repository>
</repositories>
...
...
mall-sql/mall_create.sql
View file @
2f0e41b2
...
...
@@ -2527,7 +2527,7 @@ ALTER TABLE `user_asset_record` ADD COLUMN `goods_coin` varchar(32) CHARACTER S
ALTER
TABLE
`merchant_integral`
ADD
COLUMN
`price`
decimal
(
20
,
2
)
unsigned
NOT
NULL
DEFAULT
'0.00'
COMMENT
'行情 1积分=n人民币'
;
-- 2022-2-
22
-- 2022-2-
ALTER
TABLE
`goods_spu`
ADD
COLUMN
`sales_type`
tinyint
(
1
)
NOT
NULL
DEFAULT
'1'
COMMENT
'(销售方式)1.普通 2.盲盒'
;
...
...
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