商品批量增加规则

src/main/java/com/izouma/dingdong/domain/Appraisal.java

@@ -3,6 +3,7 @@ package com.izouma.dingdong.domain;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;
@@ -13,6 +14,7 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 @ApiModel(value = "评价表", description = "评价表")
 public class Appraisal extends BaseEntity {
     @ApiModelProperty(value = "订单号", name = "orderId")
@@ -27,15 +29,18 @@ public class Appraisal extends BaseEntity {
     @ApiModelProperty(value = "图片", name = "img")
     private String img;
 
-    @Builder.Default
+
+    /**
+     * true 好评，false 差评
+     */
     @Column(nullable = false)
     @ApiModelProperty(value = "商品评分", name = "goodsScore")
-    private Boolean goodsLike = false;
+    private Boolean goodsLike = true ;
 
-    @Builder.Default
+/*    @Builder.Default
     @Column(nullable = false)
     @ApiModelProperty(value = "商品评分", name = "goodsScore")
-    private Boolean goodsBad = false;
+    private Boolean goodsBad = false;*/
 
     @ApiModelProperty(value = "商品评价", name = "goodsAppraise")
     private String goodsAppraise;
@@ -64,4 +69,7 @@ public class Appraisal extends BaseEntity {
 
     @ApiModelProperty(value = "点赞数")
     private Integer likes;
+
+    @Column(nullable = false)
+    private Boolean enabled = true;
 }

src/main/java/com/izouma/dingdong/domain/MoneyRecord.java

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -20,6 +21,7 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 @ApiModel(value = "余额记录", description = "余额记录")
 public class MoneyRecord extends BaseEntity {
     @ApiModelProperty(value = "显示头像")
@@ -33,7 +35,7 @@ public class MoneyRecord extends BaseEntity {
     @ApiModelProperty(value = "消费名称", name = "name")
     private String name;
 
-    @ApiModelProperty(value = "流水号",name = "num")
+    @ApiModelProperty(value = "流水号", name = "num")
     private String num;
 
     @Enumerated(EnumType.STRING)
@@ -50,4 +52,6 @@ public class MoneyRecord extends BaseEntity {
     @ApiModelProperty(value = "备注", name = "remark")
     private String remark;
 
+    @Column(nullable = false)
+    private Boolean enabled = true;
 }

src/main/java/com/izouma/dingdong/domain/OrderGoodsSpec.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -20,6 +21,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 @ApiModel(value = "订单商品及规格", description = "订单商品及规格")
 public class OrderGoodsSpec extends BaseEntity implements Serializable {
 //    private Long userId;
@@ -57,4 +59,7 @@ public class OrderGoodsSpec extends BaseEntity implements Serializable {
     @NotFound(action = NotFoundAction.IGNORE)
     private Goods goods;
 
+    @Column(nullable = false)
+    private Boolean enabled = true;
+
 }

src/main/java/com/izouma/dingdong/domain/OrderInfo.java

@@ -5,6 +5,7 @@ import com.izouma.dingdong.enums.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
@@ -17,6 +18,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 @ApiModel(value = "订单表", description = "订单表")
 public class OrderInfo extends BaseEntity {
     @ApiModelProperty(value = "用户ID", name = "userId")
@@ -122,7 +124,8 @@ public class OrderInfo extends BaseEntity {
     @ApiModelProperty(value = "用户收到时间", name = "userReceivedTime")
     private LocalDateTime userReceivedTime;
 
-    private Boolean enabled;
+    @Column(nullable = false)
+    private Boolean enabled = true;
 
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumn(name = "orderInfoId")

src/main/java/com/izouma/dingdong/domain/OrderRefundApply.java

@@ -12,6 +12,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
@@ -22,6 +23,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @Entity
 @Builder
+@Where(clause = "enabled = 1")
 @ApiModel(value = "退款申请", description = "退款申请")
 public class OrderRefundApply extends BaseEntity {
     @ApiModelProperty(value = "订单ID", name = "orderId")
@@ -92,4 +94,7 @@ public class OrderRefundApply extends BaseEntity {
 
     @ApiModelProperty(value = "审核时间", name = "platformAuditTime")
     private LocalDateTime platformAuditTime;
+
+    @Column(nullable = false)
+    private Boolean enabled = true;
 }

src/main/java/com/izouma/dingdong/domain/backstage/Banner.java

@@ -7,16 +7,21 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 @Entity
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 public class Banner extends BaseEntity {
     @ApiModelProperty(value = "图片", name = "pic")
     private String pic;
@@ -31,5 +36,28 @@ public class Banner extends BaseEntity {
     @ApiModelProperty(value = "类型", name = "type")
     private BannerType type;
 
+    @ApiModelProperty(value = "推广开始时间", name = "startDateTime")
+    private LocalDateTime startDateTime;
+
+    @ApiModelProperty(value = "推广结束时间", name = "startEndTime")
+    private LocalDateTime endDateTime;
+
+    @ApiModelProperty(value = "分类下的banner", name = "categoryId")
+    private Long categoryId;
+
+    @Column(nullable = false)
+    private Boolean enabled = true;
+
 //    private String address;
+
+/*    @ApiModelProperty(value = "经度", name = "longitude")
+    private BigDecimal longitude;
+
+    @ApiModelProperty(value = "纬度", name = "latitude")
+    private BigDecimal latitude;*/
+
+    @ApiModelProperty(value = "商家Id", name = "merchantId")
+    private Long merchantId;
+
+
 }

src/main/java/com/izouma/dingdong/domain/backstage/BlackList.java

@@ -8,7 +8,9 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -19,6 +21,7 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 @ApiModel(value = "黑名单表", description = "黑名单")
 public class BlackList extends BaseEntity {
     @ApiModelProperty(value = "用户ID", name = "userId")
@@ -43,4 +46,7 @@ public class BlackList extends BaseEntity {
 
     @ApiModelProperty(value = "移出时间", name = "removeTime")
     private LocalDateTime removeTime;
+
+    @Column(nullable = false)
+    private Boolean enabled = true;
 }

src/main/java/com/izouma/dingdong/domain/backstage/Complaint.java

@@ -9,7 +9,9 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -20,6 +22,7 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 //@JsonIgnoreProperties(value = { "hibernateLazyInitializer"})
 @ApiModel(value = "投诉表", description = "投诉表")
 public class Complaint extends BaseEntity {
@@ -49,4 +52,6 @@ public class Complaint extends BaseEntity {
     @ApiModelProperty(value = "解决方式")
     private Solution solution;
 
+    @Column(nullable = false)
+    private Boolean enabled = true;
 }

src/main/java/com/izouma/dingdong/domain/backstage/CooperateApply.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -65,5 +66,6 @@ public class CooperateApply extends BaseEntity {
     @ApiModelProperty(value = "是否联系", name = "isPass")
     private Boolean isPass;
 
+    @Column(nullable = false)
     private Boolean enabled = true;
 }

src/main/java/com/izouma/dingdong/domain/backstage/Email.java

@@ -7,7 +7,9 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import java.time.LocalDate;
 
@@ -16,6 +18,7 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 @ApiModel(value = "系统邮件", description = "系统邮件")
 public class Email extends BaseEntity {
     @ApiModelProperty(value = "发件人", name = "sendUserId")
@@ -38,7 +41,8 @@ public class Email extends BaseEntity {
     @ApiModelProperty(value = "内容", name = "content")
     private String content;
 
-    private Boolean enabled;
+    @Column(nullable = false)
+    private Boolean enabled = true;
 
 /*    @Enumerated(EnumType.STRING)
     @ApiModelProperty(value = "消息中心", name = "type")

src/main/java/com/izouma/dingdong/domain/backstage/Promote.java

@@ -1,13 +1,17 @@
 package com.izouma.dingdong.domain.backstage;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.izouma.dingdong.domain.BaseEntity;
+import com.izouma.dingdong.domain.merchant.Merchant;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
-import javax.persistence.Entity;
+import javax.persistence.*;
 import java.time.LocalDateTime;
 
 @Data
@@ -15,22 +19,30 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @Entity
 @Builder
+@Where(clause = "enabled = 1")
+@ApiModel(value = "首页推荐位")
 public class Promote extends BaseEntity {
 
     @ApiModelProperty(value = "商家ID", name = "merchantId")
     private Long merchantId;
 
     /**
-     * 推广位 主推广 副推广
+     * 推广位:1主推广 2副推广
      */
     @ApiModelProperty(value = "位置", name = "action")
     private Integer action;
 
-    @ApiModelProperty(value = "推广开始时间",name = "startDateTime")
+    @ApiModelProperty(value = "推广开始时间", name = "startDateTime")
     private LocalDateTime startDateTime;
 
-    @ApiModelProperty(value = "推广结束时间",name = "startEndTime")
+    @ApiModelProperty(value = "推广结束时间", name = "startEndTime")
     private LocalDateTime endDateTime;
 
+    @Column(nullable = false)
+    private Boolean enabled = true;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "merchantId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    private Merchant merchant;
 
 }

src/main/java/com/izouma/dingdong/domain/backstage/RefundApply.java

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -17,6 +18,7 @@ import java.math.BigDecimal;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 @ApiModel(value = "退款申请", description = "退款申请")
 public class RefundApply extends BaseEntity {
     @ApiModelProperty(value = "订单ID", name = "orderId")

src/main/java/com/izouma/dingdong/domain/backstage/Tag.java

@@ -24,4 +24,6 @@ public class Tag extends BaseEntity {
     @ApiModelProperty(value = "标签名称", name = "name")
     private String name;
     //口碑联盟
+
+   // private
 }

src/main/java/com/izouma/dingdong/domain/backstage/Voice.java

@@ -37,6 +37,8 @@ public class Voice extends BaseEntity {
     @ApiModelProperty(value = "泰文")
     private String thUrl;
 
+
+
 /*    @ApiModelProperty(value = "是否开启")
     private Boolean isOpen;*/
 }

src/main/java/com/izouma/dingdong/domain/merchant/AutomaticResponse.java

@@ -5,6 +5,7 @@ import com.izouma.dingdong.domain.backstage.Voice;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -15,6 +16,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 @ApiModel(value = "自动回复以及语音设置")
 public class AutomaticResponse extends BaseEntity implements Serializable {
 
@@ -37,4 +39,6 @@ public class AutomaticResponse extends BaseEntity implements Serializable {
     @JoinColumn(name = "voiceId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     private Voice voice;
 
+    @Column(nullable = false)
+    private Boolean enabled = true;
 }

src/main/java/com/izouma/dingdong/domain/merchant/Goods.java

@@ -89,6 +89,7 @@ public class Goods extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "包装价格", name = "packingPrice")
     private BigDecimal packingPrice;
 
+    @Column(nullable = false)
     private Boolean enabled;
 
     @ApiModelProperty(value = "通过", name = "isPass")

src/main/java/com/izouma/dingdong/domain/merchant/GoodsSpecification.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import javax.validation.constraints.Size;
@@ -19,6 +20,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 //@JsonIgnoreProperties(value = { "hibernateLazyInitializer"})
 @ApiModel(value = "GoodsSpecification", description = "商品规格")
 public class GoodsSpecification extends BaseEntity implements Serializable {
@@ -42,4 +44,7 @@ public class GoodsSpecification extends BaseEntity implements Serializable {
     @NotFound(action = NotFoundAction.IGNORE)
     @ApiModelProperty(value = "子分类",name = "children")
     private List<GoodsSpecification> children;
+
+    @Column(nullable = false)
+    private Boolean enabled = true;
 }

src/main/java/com/izouma/dingdong/domain/merchant/Merchant.java

@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @Builder
 @JsonIgnoreProperties(value = {"hibernateLazyInitializer"})
-@Where(clause = "enabled = true")
+@Where(clause = "enabled = 1")
 @ApiModel(value = "商户信息", description = "商户信息")
 public class Merchant extends BaseEntity implements Serializable {
 

src/main/java/com/izouma/dingdong/domain/merchant/MerchantClassification.java

@@ -5,6 +5,8 @@ import com.izouma.dingdong.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
+import org.hibernate.annotations.Where;
+
 import javax.persistence.*;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
@@ -15,6 +17,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @Entity
 @Builder
+@Where(clause = "enabled = 1")
 @ApiModel(value = "商家自定义分类")
 public class MerchantClassification extends BaseEntity implements Serializable {
 
@@ -46,4 +49,6 @@ public class MerchantClassification extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "分类类型")
     private Integer type;
 
+    @Column(nullable = false)
+    private Boolean enabled = true;
 }

src/main/java/com/izouma/dingdong/domain/merchant/MerchantSettings.java

@@ -25,7 +25,7 @@ import java.util.Set;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@Where(clause = "enabled = true")
+@Where(clause = "enabled = 1")
 @ApiModel(value = "商户设置", description = "商户设置")
 public class MerchantSettings extends BaseEntity implements Serializable {
 /*    @ApiModelProperty(value = "用户ID")

src/main/java/com/izouma/dingdong/domain/rider/Rider.java

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -17,6 +18,7 @@ import java.math.BigDecimal;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 @ApiModel(value = "骑手", description = "骑手")
 public class Rider extends BaseEntity {
     @ApiModelProperty(value = "用户ID", name = "userId")
@@ -59,4 +61,7 @@ public class Rider extends BaseEntity {
     @ApiModelProperty(value = "黑名单", name = "blacklist")
     private Boolean blacklist;
 
+    @Column(nullable = false)
+    private Boolean enabled = true;
+
 }

src/main/java/com/izouma/dingdong/domain/user/ShoppingCart.java

@@ -4,11 +4,13 @@ import com.izouma.dingdong.domain.BaseEntity;
 import com.izouma.dingdong.domain.OrderGoodsSpec;
 import com.izouma.dingdong.domain.User;
 import com.izouma.dingdong.domain.merchant.Merchant;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -20,6 +22,8 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
+@ApiModel(value = "购物车")
 public class ShoppingCart extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "用户ID", name = "userId")
     private Long userId;
@@ -36,7 +40,7 @@ public class ShoppingCart extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "已减优惠")
     private BigDecimal reducedAmount;
 
-    @ApiModelProperty(value = "包装价格",name = "packingPrice")
+    @ApiModelProperty(value = "包装价格", name = "packingPrice")
     private BigDecimal packingPrice;
 
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@@ -63,5 +67,7 @@ public class ShoppingCart extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "实付金额", name = "realAmount")
     private BigDecimal realAmount;
 
+    @Column(nullable = false)
+    private Boolean enabled = true;
 
 }

src/main/java/com/izouma/dingdong/domain/user/UserCoupon.java

@@ -9,6 +9,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;
@@ -18,6 +19,7 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@Where(clause = "enabled = 1")
 public class UserCoupon extends BaseEntity {
     @ApiModelProperty(value = "用户ID", name = "userId")
     private Long userId;
@@ -35,7 +37,7 @@ public class UserCoupon extends BaseEntity {
     @JsonIgnore
     private User user;
 
-   // @ApiModelProperty(value = "是否过期", name = "isExpired")
+    // @ApiModelProperty(value = "是否过期", name = "isExpired")
 //    private Boolean isExpired;
 
     //用于限制手机号
@@ -45,4 +47,7 @@ public class UserCoupon extends BaseEntity {
     @JoinColumn(name = "couponId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @JsonIgnore
     private Coupon coupon;
+
+    @Column(nullable = false)
+    private Boolean enabled = true;
 }

src/main/java/com/izouma/dingdong/dto/AppraisalMerDTO.java

@@ -37,8 +37,8 @@ public class AppraisalMerDTO {
     @ApiModelProperty(value = "商品评分", name = "goodsScore")
     private Boolean goodsLike;
 
-    @ApiModelProperty(value = "商品评分", name = "goodsScore")
-    private Boolean goodsBad;
+/*    @ApiModelProperty(value = "商品评分", name = "goodsScore")
+    private Boolean goodsBad;*/
 
     @ApiModelProperty(value = "点赞数")
     private Integer likes;

src/main/java/com/izouma/dingdong/enums/BannerType.java

@@ -3,7 +3,7 @@ package com.izouma.dingdong.enums;
 public enum BannerType {
     TOP("顶部"),
     AREA("优惠专区"),
-    ;
+    CATEGORY("分类下banner");
 
     private String description;
 

src/main/java/com/izouma/dingdong/repo/AppraisalRepo.java

@@ -3,7 +3,10 @@ package com.izouma.dingdong.repo;
 import com.izouma.dingdong.domain.Appraisal;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
+import javax.transaction.Transactional;
 import java.util.List;
 import java.util.Optional;
 
@@ -15,5 +18,10 @@ public interface AppraisalRepo extends JpaRepository<Appraisal, Long>, JpaSpecif
 
     List<Appraisal> findAllByRiderId(Long riderId);
 
+    @Query("update Appraisal t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
+
 
 }

src/main/java/com/izouma/dingdong/repo/MoneyRecordRepo.java

@@ -6,12 +6,20 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.lang.Nullable;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 public interface MoneyRecordRepo extends JpaRepository<MoneyRecord, Long>, JpaSpecificationExecutor<MoneyRecord> {
     List<MoneyRecord> findAllByUserId(Long userId);
 
     Page<MoneyRecord> findAllByUserId(Long userId, Pageable pageable);
+
+    @Query("update MoneyRecord t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
 }

src/main/java/com/izouma/dingdong/repo/OrderRefundApplyRepo.java

@@ -5,7 +5,10 @@ import com.izouma.dingdong.domain.OrderRefundApply;
 import com.izouma.dingdong.enums.RefundStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
+import javax.transaction.Transactional;
 import java.util.List;
 import java.util.Optional;
 
@@ -19,4 +22,9 @@ public interface OrderRefundApplyRepo extends JpaRepository<OrderRefundApply, Lo
     //显示上报退款申请
     List<OrderRefundApply> findAllByReportIsTrue();
 
+    @Query("update OrderRefundApply t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
+
 }

src/main/java/com/izouma/dingdong/repo/backstage/BannerRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.dingdong.repo.backstage;
+
+import com.izouma.dingdong.domain.backstage.Banner;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface BannerRepo extends JpaRepository<Banner, Long>, JpaSpecificationExecutor<Banner> {
+    @Query("update Banner t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
+}

src/main/java/com/izouma/dingdong/repo/backstage/BlackListRepo.java

@@ -3,6 +3,14 @@ package com.izouma.dingdong.repo.backstage;
 import com.izouma.dingdong.domain.backstage.BlackList;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
 
 public interface BlackListRepo extends JpaRepository<BlackList, Long>, JpaSpecificationExecutor<BlackList> {
+    @Query("update BlackList t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
 }

src/main/java/com/izouma/dingdong/repo/backstage/CategoryRepo.java

@@ -3,7 +3,10 @@ package com.izouma.dingdong.repo.backstage;
 import com.izouma.dingdong.domain.backstage.Category;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 public interface CategoryRepo extends JpaRepository<Category, Long>, JpaSpecificationExecutor<Category> {

src/main/java/com/izouma/dingdong/repo/backstage/ChatWordsRepo.java

@@ -3,6 +3,10 @@ package com.izouma.dingdong.repo.backstage;
 import com.izouma.dingdong.domain.backstage.ChatWords;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
 
 public interface ChatWordsRepo extends JpaRepository<ChatWords, Long>, JpaSpecificationExecutor<ChatWords> {
 }

src/main/java/com/izouma/dingdong/repo/backstage/ComplaintRepo.java

@@ -3,6 +3,14 @@ package com.izouma.dingdong.repo.backstage;
 import com.izouma.dingdong.domain.backstage.Complaint;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
 
 public interface ComplaintRepo extends JpaRepository<Complaint, Long>, JpaSpecificationExecutor<Complaint> {
+    @Query("update Complaint t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
 }

src/main/java/com/izouma/dingdong/repo/backstage/MerchantNatureRepo.java

@@ -3,6 +3,14 @@ package com.izouma.dingdong.repo.backstage;
 import com.izouma.dingdong.domain.backstage.MerchantNature;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
 
 public interface MerchantNatureRepo extends JpaRepository<MerchantNature, Long>, JpaSpecificationExecutor<MerchantNature> {
+    @Query("update MerchantNature t set t.active = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
 }

src/main/java/com/izouma/dingdong/repo/backstage/PromoteRepo.java

@@ -0,0 +1,19 @@
+package com.izouma.dingdong.repo.backstage;
+
+import com.izouma.dingdong.domain.backstage.Promote;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+public interface PromoteRepo extends JpaRepository<Promote, Long>, JpaSpecificationExecutor<Promote> {
+    @Query("update Promote t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
+
+    List<Promote> findAllByAction(Integer action);
+}

src/main/java/com/izouma/dingdong/repo/merchant/AutomaticResponseRepo.java

@@ -3,7 +3,10 @@ package com.izouma.dingdong.repo.merchant;
 import com.izouma.dingdong.domain.merchant.AutomaticResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 public interface AutomaticResponseRepo extends JpaRepository<AutomaticResponse, Long>, JpaSpecificationExecutor<AutomaticResponse> {
@@ -13,4 +16,9 @@ public interface AutomaticResponseRepo extends JpaRepository<AutomaticResponse,
 
     //查找商户下的自动回复
     AutomaticResponse findByUserId(Long userId);
+
+    @Query("update AutomaticResponse t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
 }

src/main/java/com/izouma/dingdong/repo/merchant/GoodsSpecificationRepo.java

@@ -3,7 +3,10 @@ package com.izouma.dingdong.repo.merchant;
 import com.izouma.dingdong.domain.merchant.GoodsSpecification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 public interface GoodsSpecificationRepo extends JpaRepository<GoodsSpecification, Long>, JpaSpecificationExecutor<GoodsSpecification> {
@@ -14,4 +17,9 @@ public interface GoodsSpecificationRepo extends JpaRepository<GoodsSpecification
 
     List<GoodsSpecification> findAllByGoodsIdAndParentIsNull(Long goodsId);
 
+    @Query("update GoodsSpecification t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
+
 }

src/main/java/com/izouma/dingdong/repo/merchant/MerchantClassificationRepo.java

@@ -3,7 +3,10 @@ package com.izouma.dingdong.repo.merchant;
 import com.izouma.dingdong.domain.merchant.MerchantClassification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 public interface MerchantClassificationRepo extends JpaRepository<MerchantClassification, Long>, JpaSpecificationExecutor<MerchantClassification> {
@@ -17,4 +20,9 @@ public interface MerchantClassificationRepo extends JpaRepository<MerchantClassi
 
     MerchantClassification findByMerchantIdAndType(Long merchantId, Integer type);
 
+    @Query("update MerchantClassification t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
+
 }

src/main/java/com/izouma/dingdong/repo/merchant/MerchantRepo.java

@@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
@@ -24,4 +25,6 @@ public interface MerchantRepo extends JpaRepository<Merchant, Long>, JpaSpecific
     @Query("select t.userId from Merchant t where t.id = ?1")
     Long findUserIdById(Long id);
 
+    List<Merchant> findAllByEstablishTimeAfter(LocalDateTime dateTime);
+
 }

src/main/java/com/izouma/dingdong/repo/user/ShoppingCartRepo.java

@@ -4,7 +4,10 @@ import com.izouma.dingdong.domain.user.ShoppingCart;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 public interface ShoppingCartRepo extends JpaRepository<ShoppingCart, Long>, JpaSpecificationExecutor<ShoppingCart> {
@@ -13,4 +16,9 @@ public interface ShoppingCartRepo extends JpaRepository<ShoppingCart, Long>, Jpa
     ShoppingCart findByUserIdAndMerchantId(Long userId, Long merchantId);
 
     List<ShoppingCart> findAllByUserId(Long userId);
+
+    @Query("update ShoppingCart t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
 }

src/main/java/com/izouma/dingdong/repo/user/UserCouponRepo.java

@@ -3,9 +3,17 @@ package com.izouma.dingdong.repo.user;
 import com.izouma.dingdong.domain.user.UserCoupon;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 public interface UserCouponRepo extends JpaRepository<UserCoupon, Long>, JpaSpecificationExecutor<UserCoupon> {
     List<UserCoupon> findAllByUserIdAndIsUsedFalse(Long userId);
+
+    @Query("update UserCoupon t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
 }

src/main/java/com/izouma/dingdong/service/AppraisalService.java

@@ -90,7 +90,7 @@ public class AppraisalService {
                 .appraiseTime(appraisal.getAppraiseTime())
                 .avatar(user.getAvatar())
                 .goodsAppraise(appraisal.getGoodsAppraise())
-                .goodsBad(appraisal.getGoodsBad())
+                //.goodsBad(appraisal.getGoodsBad())
                 .goodsLike(appraisal.getGoodsLike())
                 .goodsName(goodsName)
                 .merchantReply(appraisal.getMerchantReply())

src/main/java/com/izouma/dingdong/service/OrderInfoService.java

@@ -55,7 +55,6 @@ public class OrderInfoService {
     private SalesService salesService;
     private MerchantRepo merchantRepo;
     private UserCouponRepo userCouponRepo;
-    private MoneyRecordRepo moneyRecordRepo;
     private OrderRefundApplyService orderRefundApplyService;
     private SysConfigRepo sysConfigRepo;
     private RiderRepo riderRepo;
@@ -395,7 +394,10 @@ public class OrderInfoService {
     /*
     用户取消 取消订单
      */
-//    public void
+/*    public void cancelCancelOrder(Long orderId) {
+
+
+    }*/
 
     /*
     订单完成结算钱
@@ -418,4 +420,8 @@ public class OrderInfoService {
         //骑手应得
         riderService.income(orderInfo.getRiderId(), orderInfo.getUserId(), orderInfo.getDeliveryAmount(), FinancialType.INCOME);
     }
+
+    /*
+    支付倒计时
+     */
 }

src/main/java/com/izouma/dingdong/service/backstage/BannerService.java

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.service.backstage;
+
+import com.izouma.dingdong.domain.backstage.Banner;
+import com.izouma.dingdong.repo.backstage.BannerRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class BannerService {
+
+    private BannerRepo bannerRepo;
+
+}

src/main/java/com/izouma/dingdong/service/backstage/PromoteService.java

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.service.backstage;
+
+import com.izouma.dingdong.domain.backstage.Promote;
+import com.izouma.dingdong.repo.backstage.PromoteRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class PromoteService {
+
+    private PromoteRepo promoteRepo;
+
+}

src/main/java/com/izouma/dingdong/service/merchant/MerchantService.java

@@ -365,5 +365,31 @@ public class MerchantService {
         merchantSettingsRepo.save(merchant);
     }
 
+    /*
+    距离排序
+     */
+    public List<Merchant> distanceSorting(Double longitude, Double latitude){
+        List<Merchant> merchants = merchantRepo.findAll();
+
+        //所有商家要按距离排序规则
+        Map<Merchant, Double> map = new HashMap<>();
+        //算距离
+        for (Merchant m : merchants) {
+            if (m.getLatitude() != null && m.getLongitude() != null) {
+                Double distance = MapUtils.distance(m.getLongitude(), m.getLatitude(), longitude, latitude);
+                map.put(m, distance);
+            }
+        }
+
+        //排序
+        List<Map.Entry<Merchant, Double>> list = new ArrayList<>(map.entrySet());
+        list.sort(Comparator.comparing(Map.Entry<Merchant, Double>::getValue));
+        List<Merchant> mers = new ArrayList<>();
+        for (Map.Entry<Merchant, Double> m : list) {
+            mers.add(m.getKey());
+        }
+
+        return mers;
+    }
 
 }

src/main/java/com/izouma/dingdong/service/merchant/MerchantSettingsService.java

@@ -4,6 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import com.izouma.dingdong.domain.MoneyRecord;
 import com.izouma.dingdong.domain.OrderInfo;
 import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.domain.backstage.Banner;
+import com.izouma.dingdong.domain.backstage.Category;
+import com.izouma.dingdong.domain.backstage.Promote;
 import com.izouma.dingdong.domain.backstage.TimeTag;
 import com.izouma.dingdong.domain.merchant.Merchant;
 import com.izouma.dingdong.domain.merchant.MerchantSettings;
@@ -13,6 +16,9 @@ import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.repo.MoneyRecordRepo;
 import com.izouma.dingdong.repo.OrderInfoRepo;
 import com.izouma.dingdong.repo.UserRepo;
+import com.izouma.dingdong.repo.backstage.BannerRepo;
+import com.izouma.dingdong.repo.backstage.CategoryRepo;
+import com.izouma.dingdong.repo.backstage.PromoteRepo;
 import com.izouma.dingdong.repo.backstage.TimeTagRepo;
 import com.izouma.dingdong.repo.merchant.MerchantRepo;
 import com.izouma.dingdong.repo.merchant.MerchantSettingsRepo;
@@ -20,8 +26,11 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -40,6 +49,12 @@ public class MerchantSettingsService {
 
     private MoneyRecordRepo moneyRecordRepo;
 
+    private BannerRepo bannerRepo;
+
+    private CategoryRepo categoryRepo;
+
+    private PromoteRepo promoteRepo;
+
     /*
     显示所有订单
      */
@@ -96,5 +111,44 @@ public class MerchantSettingsService {
         );
     }
 
+    /*
+     * 首页上的东西
+     * banner
+     * 分类
+     * 优惠专区
+     * 每日力荐
+     * 新店推荐
+     * 推荐商家
+     * 发现美食
+     */
+    public Map<String, Object> index(Double longitude, Double latitude) {
+        //banner
+        List<Banner> banners = bannerRepo.findAll();
+
+        //一级分类
+        List<Category> categories = categoryRepo.findAllByParent((long) 1);
+
+        //优惠专区
+        //主推荐位 2个
+        List<Promote> promote1 = promoteRepo.findAllByAction(1);
+        promote1.subList(0, 2);
+        //副推荐位 4个
+        List<Promote> promote2 = promoteRepo.findAllByAction(2);
+        promote2.subList(0, 4);
+
+        //新店推荐 最多8个
+        LocalDate date = LocalDate.now().minusMonths(1);
+        LocalTime time = LocalTime.parse("00:00:00");
+        LocalDateTime dateTime = LocalDateTime.of(date, time);
+        List<Merchant> merchants = merchantRepo.findAllByEstablishTimeAfter(dateTime);
+        merchants.subList(0, 8);
+
+        //推荐商家
+
+
+        //发现美食
+
+        return null;
+    }
 
 }

src/main/java/com/izouma/dingdong/service/merchant/SalesService.java

@@ -90,7 +90,7 @@ public class SalesService {
      */
     public void addLike(Appraisal appraisal) {
         //ppraisal appraisal = appraisalRepo.findByOrderInfoId(appraisalId).orElseThrow(new BusinessException("评价不存在"));
-       List<OrderGoodsSpec> specs = orderGoodsSpecRepo.findAllByOrderInfoId(appraisal.getOrderInfoId());
+        List<OrderGoodsSpec> specs = orderGoodsSpecRepo.findAllByOrderInfoId(appraisal.getOrderInfoId());
 
         specs.forEach(spec -> {
             //Sales daySales = salesRepo.findByGoodsIdAndDay(spec.getGoodsId(), LocalDate.now());
@@ -111,9 +111,7 @@ public class SalesService {
                 daySales.setDayLikes(daySales.getDayLikes() + 1);
                 //查商品数据，加好评数
                 goodsRepo.updateLikesById(spec.getGoodsId());
-            }
-
-            if (appraisal.getGoodsBad()) {
+            } else {
                 daySales.setDayBad(daySales.getDayBad() + 1);
                 //查商品数据，加差评数
                 goodsRepo.updateBadById(spec.getGoodsId());

src/main/java/com/izouma/dingdong/web/backstage/BannerController.java

@@ -0,0 +1,63 @@
+package com.izouma.dingdong.web.backstage;
+
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.backstage.Banner;
+import com.izouma.dingdong.service.backstage.BannerService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.backstage.BannerRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/banner")
+@AllArgsConstructor
+public class BannerController extends BaseController {
+    private BannerService bannerService;
+    private BannerRepo bannerRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Banner save(@RequestBody Banner record) {
+        if (record.getId() != null) {
+            Banner orig = bannerRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return bannerRepo.save(orig);
+        }
+        return bannerRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<Banner> all(PageQuery pageQuery) {
+        return bannerRepo.findAll(toSpecification(pageQuery,Banner.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public Banner get(@PathVariable Long id) {
+        return bannerRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        bannerRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Banner> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/dingdong/web/backstage/PromoteController.java

@@ -0,0 +1,63 @@
+package com.izouma.dingdong.web.backstage;
+
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.backstage.Promote;
+import com.izouma.dingdong.service.backstage.PromoteService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.backstage.PromoteRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/promote")
+@AllArgsConstructor
+public class PromoteController extends BaseController {
+    private PromoteService promoteService;
+    private PromoteRepo promoteRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Promote save(@RequestBody Promote record) {
+        if (record.getId() != null) {
+            Promote orig = promoteRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return promoteRepo.save(orig);
+        }
+        return promoteRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<Promote> all(PageQuery pageQuery) {
+        return promoteRepo.findAll(toSpecification(pageQuery,Promote.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public Promote get(@PathVariable Long id) {
+        return promoteRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        promoteRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Promote> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/dingdong/web/merchant/GoodsController.java

@@ -1,7 +1,8 @@
 package com.izouma.dingdong.web.merchant;
 
-import cn.hutool.core.util.ObjectUtil;
+
 import com.izouma.dingdong.enums.ApplyStatus;
+import com.izouma.dingdong.repo.merchant.GoodsSpecificationRepo;
 import com.izouma.dingdong.service.merchant.MerchantService;
 import com.izouma.dingdong.utils.SecurityUtils;
 import com.izouma.dingdong.web.BaseController;
@@ -33,6 +34,8 @@ public class GoodsController extends BaseController {
 
     private MerchantService merchantService;
 
+    private GoodsSpecificationRepo goodsSpecificationRepo;
+
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     @ApiOperation("添加修改商品")
@@ -63,8 +66,9 @@ public class GoodsController extends BaseController {
 
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
-
         goodsRepo.deleteById(id);
+        //规格一并被删除
+        goodsSpecificationRepo.deleteByGoodsId(id);
     }
 
     @GetMapping("/excel")

src/main/java/com/izouma/dingdong/web/merchant/GoodsSpecificationController.java

@@ -82,7 +82,7 @@ public class GoodsSpecificationController extends BaseController {
     }
 
 
-    @GetMapping("/saveAll")
+    @PostMapping("/saveAll")
     @ApiOperation("批量保存规格")
     public List<GoodsSpecification> saveAll(List<GoodsSpecification> spec) {
         return goodsSpecificationService.saveAll(spec);

src/main/java/com/izouma/dingdong/web/merchant/MerchantController.java

@@ -3,6 +3,7 @@ package com.izouma.dingdong.web.merchant;
 import com.izouma.dingdong.domain.merchant.MerchantSettings;
 import com.izouma.dingdong.dto.MerchantDTO;
 import com.izouma.dingdong.repo.merchant.MerchantSettingsRepo;
+import com.izouma.dingdong.service.merchant.MerchantSettingsService;
 import com.izouma.dingdong.utils.SecurityUtils;
 import com.izouma.dingdong.web.BaseController;
 import com.izouma.dingdong.domain.merchant.Merchant;
@@ -16,6 +17,7 @@ import com.izouma.dingdong.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -30,6 +32,7 @@ public class MerchantController extends BaseController {
     private MerchantService merchantService;
     private MerchantRepo merchantRepo;
     private MerchantSettingsRepo merchantSettingsRepo;
+    private MerchantSettingsService merchantSettingsService;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -104,14 +107,21 @@ public class MerchantController extends BaseController {
         merchantService.closeMer(merchantId);
     }
 
+
     @GetMapping("/showAll")
     @ApiOperation("商家所有信息")
-    public Page<MerchantDTO> showAll(PageQuery pageQuery, BigDecimal longitude, BigDecimal latitude) {
+    public Page<MerchantDTO> showAll(PageQuery pageQuery, Double longitude, Double latitude, String popularTag) {
+        List<MerchantDTO> list = merchantService.showAll(pageQuery, longitude, latitude, popularTag, SecurityUtils.getAuthenticatedUser().getId());
+        return new PageImpl<>(list, toPageRequest(pageQuery), list.size());
 
+    }
 
-/*        return merchantService.showAll(pageQuery);*/
-        return null;
+    @GetMapping("/timeTag")
+    @ApiOperation("时间标签下的商户")
+    public List<MerchantDTO> timeMer(Long timeTagId) {
+        return merchantSettingsService.timeMerchant(timeTagId);
     }
 
+
 }
 

src/main/resources/application.yaml

@@ -84,3 +84,4 @@ spring:
 spring:
     profiles: prod
 
+

src/main/resources/genjson/Banner.json

@@ -0,0 +1 @@
+{"tableName":"Banner","className":"Banner","remark":"Banner设置","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/java/com/izouma/dingdong","viewPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"pic","modelName":"pic","remark":"图片","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"remark","modelName":"remark","remark":"描述","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"url","modelName":"url","remark":"地址","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"type","modelName":"type","remark":"类型","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"顶部\",\"value\":\"TOP\"},{\"label\":\"优惠专区\",\"value\":\"AREA\"}]"},{"name":"startDateTime","modelName":"startDateTime","remark":"推广开始时间","showInList":true,"showInForm":true,"formType":"datetime"},{"name":"endDateTime","modelName":"endDateTime","remark":"推广结束时间","showInList":true,"showInForm":true,"formType":"datetime"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.dingdong","tablePackage":"com.izouma.dingdong.domain.backstage.Banner","genPackage":"backstage"}

src/main/resources/genjson/Promote.json

@@ -0,0 +1 @@
+{"tableName":"Promote","className":"Promote","remark":"首页推荐位","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/java/com/izouma/dingdong","viewPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"merchantId","modelName":"merchantId","remark":"商家ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"action","modelName":"action","remark":"位置","showInList":true,"showInForm":true,"formType":"number"},{"name":"startDateTime","modelName":"startDateTime","remark":"推广开始时间","showInList":true,"showInForm":true,"formType":"datetime"},{"name":"endDateTime","modelName":"endDateTime","remark":"推广结束时间","showInList":true,"showInForm":true,"formType":"datetime"},{"name":"merchant","modelName":"merchant","remark":"merchant","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.dingdong","tablePackage":"com.izouma.dingdong.domain.backstage.Promote","genPackage":"backstage"}

src/main/vue/src/router.js

@@ -367,6 +367,38 @@ const router = new Router({
                        title: '意见反馈',
                     },
                },
+                {
+                    path: '/bannerEdit',
+                    name: 'BannerEdit',
+                    component: () => import(/* webpackChunkName: "bannerEdit" */ '@/views/backstage/BannerEdit.vue'),
+                    meta: {
+                       title: 'Banner设置编辑',
+                    },
+                },
+                {
+                    path: '/bannerList',
+                    name: 'BannerList',
+                    component: () => import(/* webpackChunkName: "bannerList" */ '@/views/backstage/BannerList.vue'),
+                    meta: {
+                       title: 'Banner设置',
+                    },
+               },
+                {
+                    path: '/promoteEdit',
+                    name: 'PromoteEdit',
+                    component: () => import(/* webpackChunkName: "promoteEdit" */ '@/views/PromoteEdit.vue'),
+                    meta: {
+                       title: '首页推荐位编辑',
+                    },
+                },
+                {
+                    path: '/promoteList',
+                    name: 'PromoteList',
+                    component: () => import(/* webpackChunkName: "promoteList" */ '@/views/PromoteList.vue'),
+                    meta: {
+                       title: '首页推荐位',
+                    },
+               }
                 /**INSERT_LOCATION**/,
                 {
                     path: '/categories',

src/main/vue/src/views/PromoteEdit.vue

@@ -0,0 +1,110 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="108px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                <el-form-item prop="merchantId" label="商家ID">
+                            <el-input-number type="number" v-model="formData.merchantId"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="action" label="位置">
+                            <el-input-number type="number" v-model="formData.action"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="startDateTime" label="推广开始时间">
+                            <el-date-picker
+                                    v-model="formData.startDateTime"
+                                    type="datetime"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
+                                    placeholder="选择日期时间">
+                            </el-date-picker>
+                </el-form-item>
+                <el-form-item prop="endDateTime" label="推广结束时间">
+                            <el-date-picker
+                                    v-model="formData.endDateTime"
+                                    type="datetime"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
+                                    placeholder="选择日期时间">
+                            </el-date-picker>
+                </el-form-item>
+                <el-form-item prop="merchant" label="merchant">
+                            <el-input v-model="formData.merchant"></el-input>
+                </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving"
+                           type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving"
+                           type="danger" v-if="formData.id">删除
+                </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'PromoteEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('promote/get/'+this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/promote/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/promote/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/PromoteList.vue

@@ -0,0 +1,175 @@
+<template>
+    <div  class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable
+                      class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search"
+                       class="filter-item">搜索
+            </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus"
+                       class="filter-item">添加
+            </el-button>
+                    </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                    <el-table-column prop="merchantId" label="商家ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="action" label="位置"
+>
+                    </el-table-column>
+                    <el-table-column prop="startDateTime" label="推广开始时间"
+                            :formatter="datetimeFormatter"
+>
+                    </el-table-column>
+                    <el-table-column prop="endDateTime" label="推广结束时间"
+                            :formatter="datetimeFormatter"
+>
+                    </el-table-column>
+                    <el-table-column prop="merchant" label="merchant"
+>
+                    </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'PromoteList',
+        mixins: [pageableTable],
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/promote/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                if (this.search) {
+                    return { search: this.search };
+                }
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/promoteEdit",
+                    query: {
+                    ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/promoteEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/promote/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/promote/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/backstage/BannerEdit.vue

@@ -0,0 +1,120 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="108px" label-position="right" size="small"
+                 style="max-width: 500px;">
+            <el-form-item prop="pic" label="图片">
+                <single-upload v-model="formData.pic"></single-upload>
+            </el-form-item>
+            <el-form-item prop="remark" label="描述">
+                <el-input v-model="formData.remark"></el-input>
+            </el-form-item>
+            <el-form-item prop="url" label="地址">
+                <el-input v-model="formData.url"></el-input>
+            </el-form-item>
+            <el-form-item prop="type" label="类型">
+                <el-select v-model="formData.type" clearable filterable placeholder="请选择">
+                    <el-option
+                            v-for="item in typeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="startDateTime" label="推广开始时间">
+                <el-date-picker
+                        v-model="formData.startDateTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择日期时间">
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item prop="endDateTime" label="推广结束时间">
+                <el-date-picker
+                        v-model="formData.endDateTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择日期时间">
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving"
+                           type="primary">保存
+                </el-button>
+                <el-button @click="onDelete" :loading="saving"
+                           type="danger" v-if="formData.id">删除
+                </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'BannerEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('banner/get/' + this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {},
+                typeOptions: [{"label": "顶部", "value": "TOP"}, {"label": "优惠专区", "value": "AREA"}],
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/banner/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/banner/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/backstage/BannerList.vue

@@ -0,0 +1,192 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable
+                      class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search"
+                       class="filter-item">搜索
+            </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus"
+                       class="filter-item">添加
+            </el-button>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+            <el-table-column prop="pic" label="图片"
+            >
+                <template slot-scope="{row}">
+                    <el-image style="width: 60px; height: 30px"
+                              :src="row.pic" fit="cover"
+                              :preview-src-list="[row.pic]"/>
+                </template>
+            </el-table-column>
+            <el-table-column prop="remark" label="描述"
+            >
+            </el-table-column>
+            <el-table-column prop="url" label="地址"
+            >
+            </el-table-column>
+            <el-table-column prop="type" label="类型"
+                             :formatter="typeFormatter"
+            >
+            </el-table-column>
+            <el-table-column prop="startDateTime" label="推广开始时间"
+                             :formatter="datetimeFormatter"
+            >
+            </el-table-column>
+            <el-table-column prop="endDateTime" label="推广结束时间"
+                             :formatter="datetimeFormatter"
+            >
+            </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import {mapState} from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'BannerList',
+        mixins: [pageableTable],
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/banner/all",
+                downloading: false,
+                typeOptions: [{"label": "顶部", "value": "TOP"}, {"label": "优惠专区", "value": "AREA"}],
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            typeFormatter(row, column, cellValue, index) {
+                let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+                if (selectedOption) {
+                    return selectedOption.label;
+                }
+                return '';
+            },
+            beforeGetData() {
+                if (this.search) {
+                    return {search: this.search};
+                }
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/bannerEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/bannerEdit",
+                    query: {
+                        id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/banner/excel", {
+                        responseType: "blob",
+                        params: {size: 10000}
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/banner/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/test/java/com/izouma/dingdong/TimeTest.java

@@ -0,0 +1,31 @@
+package com.izouma.dingdong;
+
+import org.junit.Test;
+import sun.lwawt.macosx.CSystemTray;
+
+
+public class TimeTest {
+
+    @Test
+    public void test() {
+
+        int midTime = 2 * 60;
+
+        while (midTime > 0) {
+            midTime--;
+            long hh = midTime / 60 / 60 % 60;
+            long mm = midTime / 60 % 60;
+            long ss = midTime % 60;
+            System.out.println("还剩" + hh + "小时" + mm + "分钟" + ss + "秒");
+            try {
+                Thread.sleep(1000);
+
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        System.out.println("取消订单");
+
+
+    }
+}

src/test/java/com/izouma/dingdong/service/MerchantServiceTest.java

@@ -9,12 +9,17 @@ import com.izouma.dingdong.service.merchant.MerchantService;
 import com.izouma.dingdong.service.merchant.MerchantSettingsService;
 import com.izouma.dingdong.utils.MapUtils;
 import com.izouma.dingdong.web.merchant.MerchantController;
+import com.tencent.map.geolocation.*;
+import com.tencent.map.geolocation.internal.TencentExtraKeys;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.core.parameters.P;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Collections;
 import java.util.HashMap;
@@ -31,7 +36,7 @@ public class MerchantServiceTest {
     private MerchantController merchantController;
 
     @Autowired
-    private CategoryRepo categoryRepo;
+    private MerchantRepo merchantRepo;
 
     @Autowired
     private MerchantSettingsService merchantSettingsService;
@@ -63,7 +68,7 @@ public class MerchantServiceTest {
         MerchantDTO dto = new MerchantDTO();
         dto.setMid(48L);
         //Category category = categoryRepo.findById(733L).orElse(null);
-       //dto.setCategory(Collections.singleton(category));
+        //dto.setCategory(Collections.singleton(category));
         dto.setCategoryId("733");
         System.out.println(merchantController.saveDTO(dto));
     }
@@ -112,6 +117,20 @@ public class MerchantServiceTest {
         pageQuery.setSize(50);
         //pageQuery.setSearch("走马");
         pageQuery.setSort("");
-        System.out.println(merchantService.showAll(pageQuery, 118.738275, 31.991961,"折扣商家",82L).size());
+        System.out.println(merchantService.showAll(pageQuery, 118.738275, 31.991961, "折扣商家", 82L).size());
+    }
+
+    @Test
+    public void testapi() {
+        //LocalDateTime time = LocalDateTime.now().minusDays(7);
+        LocalDate d = LocalDate.now().minusDays(7);
+
+
+        LocalTime parse = LocalTime.parse("00:00:00");
+        LocalDateTime of = LocalDateTime.of(d, parse);
+        System.out.println(of);
+        System.out.println(merchantRepo.findAllByEstablishTimeAfter(of).size());
+
+        //System.out.println(TencentLocationUtils.distanceBetween(31.981746, 118.734661, 31.990671, 118.754795));
     }
 }