Commit aac575c1 by 不悦

ycf0803

parent e77ed490
......@@ -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
......
......@@ -42,7 +42,7 @@ public class ProdTagController {
@Autowired
private ProdTagService prodTagService;
/**
/**listTagList
* 分页查询
*
* @param page 分页对象
......
......@@ -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());
......
......@@ -90,7 +90,7 @@ public class ShopDetailController {
.orderByDesc(ShopDetail::getShopId));
return ResponseEntity.ok(shopDetails);
}
/**
* 获取信息
*/
......@@ -114,7 +114,7 @@ public class ShopDetailController {
shopDetailService.save(shopDetail);
return ResponseEntity.ok().build();
}
/**
* 修改
*/
......@@ -127,7 +127,7 @@ public class ShopDetailController {
shopDetailService.updateShopDetail(shopDetail,daShopDetail);
return ResponseEntity.ok().build();
}
/**
* 删除
*/
......@@ -137,7 +137,7 @@ public class ShopDetailController {
shopDetailService.deleteShopDetailByShopId(id);
return ResponseEntity.ok().build();
}
/**
* 更新店铺状态
*/
......@@ -152,8 +152,8 @@ public class ShopDetailController {
shopDetailService.removeShopDetailCacheByShopId(shopDetail.getShopId());
return ResponseEntity.ok().build();
}
/**
* 获取所有的店铺名称
*/
......
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());
}
}
......@@ -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:
......
......@@ -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:
......
......@@ -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 {
......
......@@ -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;
}
......@@ -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);
}
......@@ -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);
}
......@@ -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);
}
}
......@@ -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 &lt; #{overTime} or start_time &gt;= #{overTime}
</update>
<update id="putaway" parameterType="com.yami.shop.bean.model.Product">
update tz_prod set status=1
where status = 0 and start_time &lt;= #{startTime} and over_time &gt; #{startTime}
</update>
</mapper>
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