Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
api
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
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
wxShop
api
Commits
aac575c1
Commit
aac575c1
authored
Aug 03, 2020
by
不悦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ycf0803
parent
e77ed490
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
89 additions
and
11 deletions
+89
-11
WebApplication.java
...min/src/main/java/com/yami/shop/admin/WebApplication.java
+1
-0
ProdTagController.java
...ava/com/yami/shop/admin/controller/ProdTagController.java
+1
-1
ProductController.java
...ava/com/yami/shop/admin/controller/ProductController.java
+1
-0
ShopDetailController.java
.../com/yami/shop/admin/controller/ShopDetailController.java
+0
-0
prodJob.java
...-admin/src/main/java/com/yami/shop/admin/job/prodJob.java
+36
-0
application-dev.yml
yami-shop-admin/src/main/resources/application-dev.yml
+6
-5
application-dev.yml
yami-shop-api/src/main/resources/application-dev.yml
+6
-3
Product.java
...-bean/src/main/java/com/yami/shop/bean/model/Product.java
+2
-0
ProductParam.java
.../src/main/java/com/yami/shop/bean/param/ProductParam.java
+4
-0
ProductMapper.java
...ervice/src/main/java/com/yami/shop/dao/ProductMapper.java
+5
-0
ProductService.java
...e/src/main/java/com/yami/shop/service/ProductService.java
+5
-0
ProductServiceImpl.java
...n/java/com/yami/shop/service/impl/ProductServiceImpl.java
+12
-1
ProductMapper.xml
...-shop-service/src/main/resources/mapper/ProductMapper.xml
+10
-1
No files found.
yami-shop-admin/src/main/java/com/yami/shop/admin/WebApplication.java
View file @
aac575c1
...
...
@@ -18,6 +18,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import
org.springframework.boot.web.servlet.support.SpringBootServletInitializer
;
import
org.springframework.cache.annotation.EnableCaching
;
import
org.springframework.context.annotation.ComponentScan
;
import
org.springframework.scheduling.annotation.EnableScheduling
;
/**
* @author lgh
...
...
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java
View file @
aac575c1
...
...
@@ -42,7 +42,7 @@ public class ProdTagController {
@Autowired
private
ProdTagService
prodTagService
;
/**
/**
listTagList
* 分页查询
*
* @param page 分页对象
...
...
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java
View file @
aac575c1
...
...
@@ -108,6 +108,7 @@ public class ProductController {
Product
product
=
mapperFacade
.
map
(
productParam
,
Product
.
class
);
product
.
setDeliveryMode
(
Json
.
toJsonString
(
productParam
.
getDeliveryModeVo
()));
product
.
setShopId
(
SecurityUtils
.
getSysUser
().
getShopId
());
product
.
setNoticePhone
(
productParam
.
getNoticePhone
());
product
.
setUpdateTime
(
new
Date
());
if
(
product
.
getStatus
()
==
1
)
{
product
.
setPutawayTime
(
new
Date
());
...
...
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ShopDetailController.java
View file @
aac575c1
yami-shop-admin/src/main/java/com/yami/shop/admin/job/prodJob.java
0 → 100644
View file @
aac575c1
package
com
.
yami
.
shop
.
admin
.
job
;
import
com.yami.shop.service.ProductService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.scheduling.annotation.EnableScheduling
;
import
org.springframework.scheduling.annotation.Scheduled
;
import
javax.annotation.Resource
;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.util.Date
;
@Configuration
@EnableScheduling
public
class
prodJob
{
@Resource
private
ProductService
productService
;
// @Scheduled(cron = "0/2 * * * * *")
public
void
timer
(){
//获取当前时间
LocalDateTime
localDateTime
=
LocalDateTime
.
now
();
System
.
out
.
println
(
"当前时间为:"
+
localDateTime
.
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
}
@Scheduled
(
cron
=
"0 1 0 * * ?"
)
public
void
editProdStatus
(){
productService
.
soldOut
(
new
Date
());
productService
.
putaway
(
new
Date
());
}
}
yami-shop-admin/src/main/resources/application-dev.yml
View file @
aac575c1
...
...
@@ -5,11 +5,12 @@ spring:
# url: jdbc:mysql://rm-m5ee12omj4y0g741d0o.mysql.rds.aliyuncs.com:3306/retail_shops?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: kszzshop
# password: eE12omj4y0g7#
# driver-class-name: com.mysql.cj.jdbc.Driver
# type: com.zaxxer.hikari.HikariDataSource
url
:
jdbc:mysql://localhost:3306/yami_shops?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username
:
root
password
:
root
# url: jdbc:mysql://localhost:3306/yami_shops?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: root
# password: root
url
:
jdbc:mysql://rm-m5ee12omj4y0g741d0o.mysql.rds.aliyuncs.com:3306/yami_test_shops?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username
:
mffpay
password
:
37k@pgDfDjF4HZT
driver-class-name
:
com.mysql.cj.jdbc.Driver
type
:
com.zaxxer.hikari.HikariDataSource
hikari
:
...
...
yami-shop-api/src/main/resources/application-dev.yml
View file @
aac575c1
...
...
@@ -7,9 +7,12 @@ spring:
# password: 123
# driver-class-name: com.mysql.cj.jdbc.Driver
# type: com.zaxxer.hikari.HikariDataSource
url
:
jdbc:mysql://127.0.0.1:3306/yami_shops?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username
:
root
password
:
root
# url: jdbc:mysql://127.0.0.1:3306/yami_shops?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: root
# password: root
url
:
jdbc:mysql://rm-m5ee12omj4y0g741d0o.mysql.rds.aliyuncs.com:3306/yami_test_shops?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username
:
mffpay
password
:
37k@pgDfDjF4HZT
driver-class-name
:
com.mysql.cj.jdbc.Driver
type
:
com.zaxxer.hikari.HikariDataSource
hikari
:
...
...
yami-shop-bean/src/main/java/com/yami/shop/bean/model/Product.java
View file @
aac575c1
...
...
@@ -147,6 +147,8 @@ public class Product implements Serializable {
private
Integer
isLimitPrice
;
@TableField
(
exist
=
false
)
private
Integer
isCrazyBuy
;
private
Date
overTime
;
private
Date
startTime
;
@Data
public
static
class
DeliveryModeVO
{
...
...
yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java
View file @
aac575c1
...
...
@@ -17,6 +17,7 @@ import lombok.Data;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Size
;
import
java.util.Date
;
import
java.util.List
;
@Data
...
...
@@ -104,4 +105,7 @@ public class ProductParam {
*/
private
List
<
Long
>
tagList
;
private
String
noticePhone
;
private
Date
overTime
;
private
Date
startTime
;
}
yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java
View file @
aac575c1
...
...
@@ -10,6 +10,7 @@
package
com
.
yami
.
shop
.
dao
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -67,4 +68,8 @@ public interface ProductMapper extends BaseMapper<Product> {
*/
IPage
<
ProductDto
>
collectionProds
(
@Param
(
"page"
)
PageParam
page
,
@Param
(
"userId"
)
String
userId
);
int
putaway
(
@Param
(
"startTime"
)
Date
startTime
);
int
soldOut
(
@Param
(
"overTime"
)
Date
overTime
);
}
yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java
View file @
aac575c1
...
...
@@ -19,6 +19,7 @@ import com.yami.shop.bean.dto.SearchProdDto;
import
com.yami.shop.bean.model.Product
;
import
com.yami.shop.common.util.PageParam
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -68,4 +69,8 @@ public interface ProductService extends IService<Product> {
List
<
TagProductDto
>
tagProdList
();
IPage
<
ProductDto
>
collectionProds
(
PageParam
page
,
String
userId
);
void
putaway
(
Date
startTime
);
void
soldOut
(
Date
overTime
);
}
yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java
View file @
aac575c1
...
...
@@ -39,6 +39,7 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.stream.Collectors
;
...
...
@@ -118,7 +119,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
@Override
//
@Cacheable(cacheNames = "product", key = "#prodId")
@Cacheable
(
cacheNames
=
"product"
,
key
=
"#prodId"
)
public
Product
getProductByProdId
(
Long
prodId
)
{
return
productMapper
.
selectById
(
prodId
);
}
...
...
@@ -208,5 +209,15 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
return
productMapper
.
collectionProds
(
page
,
userId
);
}
@Override
public
void
putaway
(
Date
startTime
)
{
productMapper
.
putaway
(
startTime
);
}
@Override
public
void
soldOut
(
Date
overTime
)
{
productMapper
.
soldOut
(
overTime
);
}
}
yami-shop-service/src/main/resources/mapper/ProductMapper.xml
View file @
aac575c1
...
...
@@ -24,6 +24,8 @@
<result
property=
"noticePhone"
column=
"notice_phone"
/>
<result
property=
"isLimitPrice"
column=
"is_limit_price"
/>
<result
property=
"isCrazyBuy"
column=
"is_crazy_buy"
/>
<result
property=
"startTime"
column=
"start_time"
/>
<result
property=
"overTime"
column=
"over_time"
/>
</resultMap>
<resultMap
id=
"tagProductMap"
type=
"com.yami.shop.bean.app.dto.TagProductDto"
>
...
...
@@ -236,5 +238,12 @@
WHERE uc.user_id = #{userId})
</select>
<update
id=
"soldOut"
parameterType=
"com.yami.shop.bean.model.Product"
>
update tz_prod set status=0
where status = 1 and over_time
<
#{overTime} or start_time
>
= #{overTime}
</update>
<update
id=
"putaway"
parameterType=
"com.yami.shop.bean.model.Product"
>
update tz_prod set status=1
where status = 0 and start_time
<
= #{startTime} and over_time
>
#{startTime}
</update>
</mapper>
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