From f473451293bb5f13de0764b90706e7b2c9b92368 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 15 Mar 2023 14:07:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B93-15=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/databases/tables_modify.sql | 4 +++ .../BuildingCommunityController.java | 10 +++++- .../service/IBuildingCommunityService.java | 5 +++ .../impl/BuildingCommunityServiceImpl.java | 9 +++++ .../build/entity/BuildingCommunity.java | 6 ++++ .../build/mapper/BuildingCommunityMapper.java | 6 ++++ .../sms/mapper/SmsCouponHistoryMapper.java | 3 ++ .../mapper/build/ComminutyMapper.xml | 7 ++++ .../mapper/sms/SmsCouponHistoryMapper.xml | 3 ++ .../resources/mapper/sms/SmsCouponMapper.xml | 5 ++- .../sms/service/ISmsCouponHistoryService.java | 1 + .../sms/service/ScheduledService.java | 36 +++++++++++++++++++ .../impl/SmsCouponHistoryServiceImpl.java | 4 +++ 13 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ScheduledService.java diff --git a/docs/databases/tables_modify.sql b/docs/databases/tables_modify.sql index 5b5776a..45cb14c 100644 --- a/docs/databases/tables_modify.sql +++ b/docs/databases/tables_modify.sql @@ -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) diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java index 0c04c86..a8b44e4 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/controller/BuildingCommunityController.java @@ -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(pageNum, pageSize), new QueryWrapper<>(entity))); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(entity.getKeyword())){ + qw.like("bc.name",entity.getKeyword()); + } + IPage page = IBuildingCommunityService.pagerList(new Page(pageNum, pageSize), qw); + return new CommonResult().success(page); +// return new CommonResult().success(IBuildingCommunityService.page(new Page(pageNum, pageSize), new QueryWrapper<>(entity))); } catch (Exception e) { log.error("根据条件查询所有小区表列表：%s", e.getMessage(), e); } diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java index c7ef905..7929fe4 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/IBuildingCommunityService.java @@ -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 { boolean saveCommunity(BuildingCommunity entity); + + IPage pagerList(Page buildingCommunityPage, QueryWrapper buildingCommunityQueryWrapper); } diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java index 0e7dfba..2e90f09 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/build/service/impl/BuildingCommunityServiceImpl.java @@ -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 pagerList(Page buildingCommunityPage, QueryWrapper buildingCommunityQueryWrapper) { + IPage page = baseMapper.pagerList(buildingCommunityPage,buildingCommunityQueryWrapper); + return page; + } } diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingCommunity.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingCommunity.java index 81c8ff2..682e1db 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingCommunity.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/entity/BuildingCommunity.java @@ -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; } diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java index cb2ba7e..2fe5292 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/build/mapper/BuildingCommunityMapper.java @@ -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 { @Param("latitude") double latitude, @Param("longitude") double longitude, @Param("pageSize") Integer pageSize); + + IPage pagerList(Page buildingCommunityPage, @Param(Constants.WRAPPER)QueryWrapper buildingCommunityQueryWrapper); } diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsCouponHistoryMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsCouponHistoryMapper.java index 90db324..661a395 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsCouponHistoryMapper.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsCouponHistoryMapper.java @@ -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 { List getDetailList(Long memberId); + + int updateUseStatus(@Param("useStatus") int i, @Param("endTime") String tomorrow); } diff --git a/mallplus-mbg/src/main/resources/mapper/build/ComminutyMapper.xml b/mallplus-mbg/src/main/resources/mapper/build/ComminutyMapper.xml index 018f009..03a624b 100644 --- a/mallplus-mbg/src/main/resources/mapper/build/ComminutyMapper.xml +++ b/mallplus-mbg/src/main/resources/mapper/build/ComminutyMapper.xml @@ -38,4 +38,11 @@ distance LIMIT 0 , {pageSize} + + diff --git a/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponHistoryMapper.xml b/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponHistoryMapper.xml index 5e804d9..74c16d2 100644 --- a/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponHistoryMapper.xml +++ b/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponHistoryMapper.xml @@ -61,4 +61,7 @@ order_sn, start_time, end_time, note + + update sms_coupon_history set use_status = #{useStatus} where end_time <= #{endTime} and use_status = 0 + diff --git a/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponMapper.xml b/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponMapper.xml index ee29973..878420d 100644 --- a/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponMapper.xml +++ b/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponMapper.xml @@ -58,9 +58,8 @@