other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改3-15问题

Browse Source
This commit is contained in:
dimengzhe
2023-03-15 14:07:40 +08:00
parent 5c9813c1a6
commit f473451293
13 changed files with 95 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/databases/tables_modify.sql
View File

@@ -30,3 +30,7 @@ ALTER TABLE mallplus1.sys_message MODIFY COLUMN utime bigint(20) unsigned NULL C
ALTER TABLE mallplus1.sys_message MODIFY COLUMN content text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容';
ALTER TABLE mallplus1.sys_message MODIFY COLUMN params varchar(5000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '参数';
ALTER TABLE mallplus1.sys_message MODIFY COLUMN code varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息编码';
ALTER table mallplus1.sms_coupon_history modify column amount decimal(10,2) ;
update sms_coupon_history set amount = (select amount from sms_coupon where sms_coupon_history.coupon_id = sms_coupon.id)

10
mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java
View File

@@ -2,11 +2,13 @@ package com.zscat.mallplus.build.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zscat.mallplus.annotation.SysLog;
import com.zscat.mallplus.build.entity.BuildingCommunity;
import com.zscat.mallplus.enums.StatusEnum;
import com.zscat.mallplus.util.EasyPoiUtils;
import com.zscat.mallplus.util.StringUtils;
import com.zscat.mallplus.utils.CommonResult;
import com.zscat.mallplus.utils.ValidatorUtils;
import io.swagger.annotations.ApiOperation;
@@ -46,7 +48,13 @@ public class BuildingCommunityController {
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize
) {
try {
return new CommonResult().success(IBuildingCommunityService.page(new Page<BuildingCommunity>(pageNum, pageSize), new QueryWrapper<>(entity)));
QueryWrapper<BuildingCommunity> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(entity.getKeyword())){
qw.like("bc.name",entity.getKeyword());
}
IPage<BuildingCommunity> page = IBuildingCommunityService.pagerList(new Page<BuildingCommunity>(pageNum, pageSize), qw);
return new CommonResult().success(page);
// return new CommonResult().success(IBuildingCommunityService.page(new Page<BuildingCommunity>(pageNum, pageSize), new QueryWrapper<>(entity)));
} catch (Exception e) {
log.error("根据条件查询所有小区表列表：%s", e.getMessage(), e);
}

5
mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java
View File

@@ -1,5 +1,8 @@
package com.zscat.mallplus.build.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zscat.mallplus.build.entity.BuildingCommunity;
@@ -14,4 +17,6 @@ import com.zscat.mallplus.build.entity.BuildingCommunity;
public interface IBuildingCommunityService extends IService<BuildingCommunity> {
boolean saveCommunity(BuildingCommunity entity);
IPage<BuildingCommunity> pagerList(Page<BuildingCommunity> buildingCommunityPage, QueryWrapper<BuildingCommunity> buildingCommunityQueryWrapper);
}

9
mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java
View File

@@ -1,5 +1,8 @@
package com.zscat.mallplus.build.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zscat.mallplus.build.entity.BuildingCommunity;
import com.zscat.mallplus.build.mapper.BuildingCommunityMapper;
@@ -63,4 +66,10 @@ public class BuildingCommunityServiceImpl extends ServiceImpl<BuildingCommunityM
userRoleMapper.insert(userRole);
return true;
}
@Override
public IPage<BuildingCommunity> pagerList(Page<BuildingCommunity> buildingCommunityPage, QueryWrapper<BuildingCommunity> buildingCommunityQueryWrapper) {
IPage<BuildingCommunity> page = baseMapper.pagerList(buildingCommunityPage,buildingCommunityQueryWrapper);
return page;
}
}

6
mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingCommunity.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@@ -205,4 +206,9 @@ public class BuildingCommunity implements Serializable {
@TableField(exist = false)
private double distance;
@TableField(exist = false)
private String companyName;
@TableField(exist = false)
@ApiModelProperty("查询条件")
private String keyword;
}

6
mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java
View File

@@ -1,6 +1,10 @@
package com.zscat.mallplus.build.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zscat.mallplus.build.entity.BuildingCommunity;
import com.zscat.mallplus.sys.entity.SysShop;
import org.apache.ibatis.annotations.Param;
@@ -25,4 +29,6 @@ public interface BuildingCommunityMapper extends BaseMapper<BuildingCommunity> {
@Param("latitude") double latitude,
@Param("longitude") double longitude,
@Param("pageSize") Integer pageSize);
IPage<BuildingCommunity> pagerList(Page<BuildingCommunity> buildingCommunityPage, @Param(Constants.WRAPPER)QueryWrapper<BuildingCommunity> buildingCommunityQueryWrapper);
}

3
mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsCouponHistoryMapper.java
View File

@@ -3,6 +3,7 @@ package com.zscat.mallplus.sms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zscat.mallplus.sms.entity.SmsCouponHistory;
import com.zscat.mallplus.sms.vo.SmsCouponHistoryDetail;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -17,4 +18,6 @@ import java.util.List;
public interface SmsCouponHistoryMapper extends BaseMapper<SmsCouponHistory> {
List<SmsCouponHistoryDetail> getDetailList(Long memberId);
int updateUseStatus(@Param("useStatus") int i, @Param("endTime") String tomorrow);
}

7
mallplus-mbg/src/main/resources/mapper/build/ComminutyMapper.xml
View File

@@ -38,4 +38,11 @@
distance
LIMIT 0 , {pageSize}
</select>
<select id="pagerList" resultType="com.zscat.mallplus.build.entity.BuildingCommunity">
select bc.*,bwc.name companyName from building_community bc left join build_wuye_company bwc on bwc.id = bc.company_id
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

3
mallplus-mbg/src/main/resources/mapper/sms/SmsCouponHistoryMapper.xml
View File

@@ -61,4 +61,7 @@
order_sn, start_time, end_time, note
</sql>
<update id="updateUseStatus">
update sms_coupon_history set use_status = #{useStatus} where end_time &lt;= #{endTime} and use_status = 0
</update>
</mapper>

5
mallplus-mbg/src/main/resources/mapper/sms/SmsCouponMapper.xml
View File

@@ -58,9 +58,8 @@
</sql>
<select id="selectNotRecive" resultMap="BaseResultMap">
SELECT sms_coupon.* from sms_coupon where count>0 and now()>=start_time and end_time>=now() and id not in
(SELECT coupon_id from sms_coupon_history where member_id =
#{memberId}) limit #{limit}
SELECT sms_coupon.* from sms_coupon where count>0 and now()>=start_time and end_time>=now() and (SELECT count(*) from sms_coupon_history where member_id =
#{memberId} and sms_coupon.id = coupon_id) &lt; per_limit limit #{limit}
</select>
<select id="selectRecive" resultMap="BaseResultMap">

1
mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsCouponHistoryService.java
View File

@@ -13,4 +13,5 @@ import com.zscat.mallplus.sms.entity.SmsCouponHistory;
*/
public interface ISmsCouponHistoryService extends IService<SmsCouponHistory> {
int updateUseStatus(int i, String tomorrow);
}

36
mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ScheduledService.java Normal file
View File

@@ -0,0 +1,36 @@
package com.zscat.mallplus.sms.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Author dimengzhe
* @Date 2023/3/15 10:47
* @Description
*/
@Component
public class ScheduledService {
@Autowired
private ISmsCouponHistoryService smsCouponHistoryService;
// @Scheduled(cron = "0 0 0 * * ?")
// @Scheduled(cron = "0 0/5 11 * * ?")
@Scheduled(cron = "*/5 * * * * ?")
public void remindVehicle() {
Date now = new Date();
//获取当前时间
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//得到今天凌晨时间
Calendar calendar = Calendar.getInstance();
calendar.setTime(now);
String tomorrow = sdf.format(calendar.getTime());
//查询优惠券历史记录中已超过endTime时间的
smsCouponHistoryService.updateUseStatus(2,tomorrow);
}
}

4
mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponHistoryServiceImpl.java
View File

@@ -17,4 +17,8 @@ import org.springframework.stereotype.Service;
@Service
public class SmsCouponHistoryServiceImpl extends ServiceImpl<SmsCouponHistoryMapper, SmsCouponHistory> implements ISmsCouponHistoryService {
@Override
public int updateUseStatus(int i, String tomorrow) {
return baseMapper.updateUseStatus(i,tomorrow);
}
}