商家端

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

@@ -0,0 +1,43 @@
+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.Column;
+import javax.persistence.Entity;
+
+@EqualsAndHashCode(callSuper = false)
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Where(clause = "enabled = 1")
+@ApiModel(value = "用户", description = "用户")
+public class BankCard extends BaseEntity {
+
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "真实姓名", name = "realName")
+    private String realName;
+
+    @ApiModelProperty(value = "电话", name = "phone")
+    private String phone;
+
+    @ApiModelProperty(value = "身份证", name = "idNo")
+    private String idNo;
+
+    @ApiModelProperty(value = "银行", name = "bankName")
+    private String bankName;
+
+    @ApiModelProperty(value = "卡号", name = "cardId")
+    private String cardNo;
+
+    @Column(nullable = false)
+    private Boolean enabled = true;
+
+}
+

src/main/java/com/izouma/dingdong/domain/user/Coupon.java → src/main/java/com/izouma/dingdong/domain/Coupon.java

@@ -1,8 +1,9 @@
-package com.izouma.dingdong.domain.user;
+package com.izouma.dingdong.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.izouma.dingdong.domain.BaseEntity;
 import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.domain.backstage.Category;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -23,8 +24,8 @@ import java.time.LocalDateTime;
 //@Where(clause = "enabled = 1")
 @ApiModel(value = "优惠券", description = "优惠券")
 public class Coupon extends BaseEntity implements Serializable {
-    @ApiModelProperty(value = "用户ID", name = "userId")
-    private Long userId;
+//    @ApiModelProperty(value = "用户ID", name = "userId")
+//    private Long userId;
 
     @ApiModelProperty(value = "优惠券名称", name = "name")
     private String name;
@@ -42,11 +43,11 @@ public class Coupon extends BaseEntity implements Serializable {
 //    @ApiModelProperty(value = "是否过期", name = "isExpired")
 //    private Boolean isExpired;
 
-    @ApiModelProperty(value = "是否已使用", name = "isUsed")
-    private Boolean isUsed;
-
-    @ApiModelProperty(value = "使用时间", name = "usedTime")
-    private LocalDateTime usedTime;
+//    @ApiModelProperty(value = "是否已使用", name = "isUsed")
+//    private Boolean isUsed;
+//
+//    @ApiModelProperty(value = "使用时间", name = "usedTime")
+//    private LocalDateTime usedTime;
 
 /*    @ApiModelProperty(value = "使用规则", name = "rule")
     private String rule;*/
@@ -61,11 +62,19 @@ public class Coupon extends BaseEntity implements Serializable {
 //    @ApiModelProperty(value = "折扣", name = "discount")
 //    private Integer discount;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "userId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
-    @JsonIgnore
-    private User user;
+//    @ManyToOne(fetch = FetchType.LAZY)
+//    @JoinColumn(name = "userId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+//    @JsonIgnore
+//    private User user;
 
     //商家发的优惠券
     private Long merchantId;
+
+    //优惠券描述
+    private String description;
+
+//    //用于限制手机号
+//    private String phone;
+
+    private String categoryIds;
 }

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

@@ -0,0 +1,38 @@
+package com.izouma.dingdong.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "余额记录", description = "余额记录")
+public class MoneyRecord extends BaseEntity {
+
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "消费名称", name = "name")
+    private String name;
+
+    @ApiModelProperty(value = "时间", name = "time")
+    private LocalDateTime time;
+
+    @Column(precision = 10, scale = 2)
+    @ApiModelProperty(value = "金额", name = "amount")
+    private BigDecimal amount;
+
+
+
+}

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

@@ -31,7 +31,7 @@ public class OrderGoodsSpec extends BaseEntity implements Serializable {
 
 //    private String goodsName;
 
-    private String specificationId;
+   // private String specificationId;
 
     @ApiModelProperty(value = "规格", name = "specification")
     private String specification;

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

@@ -77,7 +77,7 @@ public class OrderInfo extends BaseEntity {
 //    private Boolean isCoupon;
 
     @ApiModelProperty(value = "优惠券ID", name = "couponId")
-    private Long couponId;
+    private Long userCouponId;
 
 
     //配送信息

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

@@ -17,6 +17,7 @@ import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
+import java.math.BigDecimal;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -41,9 +42,10 @@ public class User extends BaseEntity implements Serializable {
 
     private String avatar;
 
-   // @JsonIgnore
+    // @JsonIgnore
     private String password;
 
+    @Builder.Default
     @Column(nullable = false)
     private Boolean enabled = true;
 
@@ -77,9 +79,10 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "身份", name = "identity")
     private Identity identity;
 
-/*    @ApiModelProperty(value = "合作申请", name = "apply")
-    private String apply;*/
+    /*    @ApiModelProperty(value = "合作申请", name = "apply")
+        private String apply;*/
 
+    @Builder.Default
     @Column(nullable = false)
     @ApiModelProperty(value = "黑名单", name = "blacklist")
     private Boolean blacklist = false;
@@ -87,4 +90,9 @@ public class User extends BaseEntity implements Serializable {
 //    @ApiModelProperty(value = "消费金额",name = "consumption")
 //    private BigDecimal consumption;
 
+    //用于商家/骑手体现
+    @Column(precision = 10, scale = 2)
+    @ApiModelProperty(value = "余额", name = "money")
+    private BigDecimal money;
+
 }

src/main/java/com/izouma/dingdong/domain/backstage/WithdrawApply.java → src/main/java/com/izouma/dingdong/domain/WithdrawApply.java

@@ -1,9 +1,8 @@
-package com.izouma.dingdong.domain.backstage;
+package com.izouma.dingdong.domain;
 
 import com.izouma.dingdong.annotations.Searchable;
-import com.izouma.dingdong.domain.BaseEntity;
 import com.izouma.dingdong.enums.PayMethod;
-import com.izouma.dingdong.enums.WithdrawalsStatus;
+import com.izouma.dingdong.enums.WithdrawStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -28,34 +27,39 @@ public class WithdrawApply extends BaseEntity {
     @ApiModelProperty(value = "用户ID", name = "userId")
     private Long userId;
 
+    //商户或骑手提现
+//    @ApiModelProperty(value = "其他ID", name = "otherId")
+//    private Long otherId;
+
 //    @ApiModelProperty(value = "工号", name = "jobNumber")
 //    private String jobNumber;
 
     @ApiModelProperty(value = "金额",name = "amount")
     private BigDecimal amount;
 
-    @Searchable
-    @ApiModelProperty(value = "账号", name = "account")
-    private String account;
+    private Long bankCardId;
 
     @Searchable
-    @ApiModelProperty(value = "真实姓名", name = "realName")
-    private String realName;
+    @ApiModelProperty(value = "卡号", name = "cardId")
+    private String cardNo;
+//
+//    @Searchable
+//    @ApiModelProperty(value = "真实姓名", name = "realName")
+//    private String realName;
 
     @ApiModelProperty(value = "是否成功", name = "consent")
     @Column(nullable = false)
     private Boolean consent;
 
-
-    @ApiModelProperty(value = "提现时间", name = "settleTime")
+    @ApiModelProperty(value = "提现时间", name = "withdrawTime")
     private LocalDateTime withdrawTime;
 
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "提现方式", name = "payMethod")
-    private PayMethod payMethod;
+    @ApiModelProperty(value = "审计时间", name = "auditTime")
+    private LocalDateTime auditTime;
 
     @Enumerated(EnumType.STRING)
     @ApiModelProperty(value = "提现状态", name = "status")
-    private WithdrawalsStatus status;
+    private WithdrawStatus status;
+
 
 }

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

@@ -64,13 +64,13 @@ public class Merchant extends BaseEntity implements Serializable {
     private String aliAccount;
 
     @ApiModelProperty(value = "总好评数量", name = "goodNum")
-    private Integer goodNum;
+    private Integer goodNum = 0;
 
     @ApiModelProperty(value = "差评数量", name = "badNum")
-    private Integer badNum;
+    private Integer badNum = 0;
 
     @ApiModelProperty(value = "月销", name = "monthSales")
-    private Integer monthSales;
+    private Integer monthSales = 0 ;
 
     @ApiModelProperty(value = "通过", name = "isPass")
     private Boolean isPass;
@@ -82,6 +82,6 @@ public class Merchant extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "成立时间", name = "established")
     private LocalDateTime establishTime;
 
-    @ApiModelProperty(value = "商家余额",name = "money")
-    private BigDecimal money;
+//    @ApiModelProperty(value = "商家余额",name = "money")
+//    private BigDecimal money;
 }

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

@@ -4,6 +4,7 @@ import com.izouma.dingdong.domain.BaseEntity;
 import com.izouma.dingdong.domain.backstage.Category;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -36,12 +37,17 @@ public class MerchantSettings extends BaseEntity {
     @ApiModelProperty(value = "商户地址", name = "address")
     private String address;
 
+    @ApiModelProperty(value = "公告",name = "proclamation")
+    private String proclamation;
+
     @ApiModelProperty(value = "简介", name = "introduction")
     private String introduction;
 
+    @Column(precision = 10, scale = 2)
     @ApiModelProperty(value = "首单优惠", name = "firstOrder")
     private BigDecimal firstOrder;
 
+    @Column(precision = 10, scale = 2)
     @ApiModelProperty(value = "新用户优惠", name = "newUser")
     private BigDecimal newUser;
 

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

@@ -1,5 +1,7 @@
-package com.izouma.dingdong.domain;
+package com.izouma.dingdong.domain.user;
 
+import com.izouma.dingdong.domain.BaseEntity;
+import com.izouma.dingdong.domain.OrderGoodsSpec;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -0,0 +1,42 @@
+package com.izouma.dingdong.domain.user;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.izouma.dingdong.domain.BaseEntity;
+import com.izouma.dingdong.domain.User;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class UserCoupon extends BaseEntity {
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    private Long couponId;
+
+    @ApiModelProperty(value = "是否已使用", name = "isUsed")
+    private Boolean isUsed;
+
+    @ApiModelProperty(value = "使用时间", name = "usedTime")
+    private LocalDateTime usedTime;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @JsonIgnore
+    private User user;
+
+   // @ApiModelProperty(value = "是否过期", name = "isExpired")
+//    private Boolean isExpired;
+
+    //用于限制手机号
+    private String phone;
+}

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

@@ -49,7 +49,8 @@ public class MerchantDTO {
         week = merchantSettings.getWeek();
         banner = merchant.getBanner();
         logo = merchantSettings.getLogo();
-        money = merchant.getMoney();
+        proclamation = merchantSettings.getProclamation();
+//        money = merchant.getMoney();
     }
 
 
@@ -149,5 +150,8 @@ public class MerchantDTO {
     @ApiModelProperty(value = "成立时间", name = "established")
     private LocalDateTime establishTime;
 
-    private BigDecimal money;
+    @ApiModelProperty(value = "公告", name = "proclamation")
+    private String proclamation;
+
+//    private BigDecimal money;
 }

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

@@ -24,7 +24,7 @@ public class UserOrderDTO {
     private Long addressId;
 
     @ApiModelProperty(value = "优惠券ID", name = "couponId")
-    private Long couponId;
+    private Long userCouponId;
 
     @ApiModelProperty(value = "支付方式", name = "payMethod")
     private PayMethod payMethod;

src/main/java/com/izouma/dingdong/enums/WithdrawalsStatus.java → src/main/java/com/izouma/dingdong/enums/WithdrawStatus.java

@@ -1,12 +1,12 @@
 package com.izouma.dingdong.enums;
 
-public enum WithdrawalsStatus {
+public enum WithdrawStatus {
     SUCCESS("提现成功"),
     FAIL("提现失败"),
     PENDING("待处理");
     private final String description;
 
-    WithdrawalsStatus(String description) {
+    WithdrawStatus(String description) {
         this.description = description;
     }
 

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

@@ -0,0 +1,20 @@
+package com.izouma.dingdong.repo;
+
+import com.izouma.dingdong.domain.BankCard;
+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 BankCardRepo extends JpaRepository<BankCard, Long>, JpaSpecificationExecutor<BankCard> {
+    @Query("update BankCard t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
+
+    //按userId查找所有卡号
+    List<BankCard> findAllByUserId(Long userId);
+}

src/main/java/com/izouma/dingdong/repo/user/CouponRepo.java → src/main/java/com/izouma/dingdong/repo/CouponRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.dingdong.repo.user;
+package com.izouma.dingdong.repo;
 
-import com.izouma.dingdong.domain.user.Coupon;
+import com.izouma.dingdong.domain.Coupon;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

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

@@ -0,0 +1,20 @@
+package com.izouma.dingdong.repo;
+
+import com.izouma.dingdong.domain.WithdrawApply;
+
+import com.izouma.dingdong.enums.WithdrawStatus;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface WithdrawalsApplyRepo extends JpaRepository<WithdrawApply, Long>, JpaSpecificationExecutor<WithdrawApply> {
+
+    //查看个人的提现记录
+    List<WithdrawApply> findByUserId(Long userId);
+
+    List<WithdrawApply> findByUserIdAndStatus(Long userId, WithdrawStatus status);
+
+    List<WithdrawApply> findByUserIdAndConsentFalse(Long userId);
+
+}

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

@@ -18,4 +18,8 @@ public interface MerchantRepo extends JpaRepository<Merchant, Long>, JpaSpecific
     Merchant findByPhone(String phone);
 
     Optional<Merchant> findByUserId(Long userId);
+
+    //按商户Id找出用户Id
+    @Query("select t.userId from Merchant t where t.id = ?1")
+    Long findUserIdById(Long id);
 }

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

@@ -1,6 +1,6 @@
-package com.izouma.dingdong.repo;
+package com.izouma.dingdong.repo.user;
 
-import com.izouma.dingdong.domain.ShoppingCart;
+import com.izouma.dingdong.domain.user.ShoppingCart;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -0,0 +1,8 @@
+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;
+
+public interface UserCouponRepo extends JpaRepository<UserCoupon, Long>, JpaSpecificationExecutor<UserCoupon> {
+}

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

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.service;
+
+import com.izouma.dingdong.domain.BankCard;
+import com.izouma.dingdong.repo.BankCardRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class BankCardService {
+
+    private BankCardRepo bankCardRepo;
+
+}

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

@@ -1,169 +0,0 @@
-package com.izouma.dingdong.service;
-
-import com.izouma.dingdong.annotations.Searchable;
-import com.izouma.dingdong.dto.PageQuery;
-import com.izouma.dingdong.utils.DateTimeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-
-import javax.persistence.criteria.Predicate;
-import java.lang.reflect.Field;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.regex.Pattern;
-
-public class BaseService {
-    public static PageRequest toPageRequest(PageQuery pageQuery) {
-        PageRequest pageRequest;
-        if (StringUtils.isNotEmpty(pageQuery.getSort())) {
-            List<Sort.Order> orders = new ArrayList<>();
-            for (String sortStr : pageQuery.getSort().split(";")) {
-                String direction = "asc";
-                String prop = sortStr;
-                if (sortStr.contains(",asc") || sortStr.contains(",desc")) {
-                    prop = sortStr.split(",")[0];
-                    direction = sortStr.split(",")[1];
-                }
-                orders.add("asc".equals(direction) ? Sort.Order.asc(prop) : Sort.Order.desc(prop));
-            }
-            pageRequest = PageRequest.of(pageQuery.getPage(), pageQuery.getSize(), Sort.by(orders));
-        } else {
-            pageRequest = PageRequest.of(pageQuery.getPage(), pageQuery.getSize());
-        }
-        return pageRequest;
-    }
-
-    public static <T> Specification<T> toSpecification(PageQuery pageQuery, Class<T> queryClass) {
-        return (Specification<T>) (root, criteriaQuery, criteriaBuilder) -> {
-            List<Predicate> and = new ArrayList<>();
-            pageQuery.getQuery().forEach((property, value) -> {
-                if (value == null) {
-                    return;
-                }
-                if (String.class.equals(value.getClass())) {
-                    if (StringUtils.isEmpty((String) value)) {
-                        return;
-                    }
-                    if ("true".equals(value) || "false".equals(value)) {
-                        and.add(criteriaBuilder
-                                .and(criteriaBuilder.equal(root.get(property), Boolean.valueOf((String) value))));
-                        return;
-                    }
-                }
-                if (property.equals("createdAt") && !StringUtils.isEmpty(value.toString())) {
-                    DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                    and.add(criteriaBuilder.between(root.get(property), LocalDateTime
-                            .parse(value.toString().split(",")[0], df), LocalDateTime
-                            .parse(value.toString().split(",")[1], df)));
-                } else {
-                    try {
-                        Field field = queryClass.getDeclaredField(property);
-                        Class fieldType = field.getType();
-                        if (Enum.class.isAssignableFrom(fieldType)) {
-                            if (value instanceof Collection) {
-                                if (!((Collection) value).isEmpty()) {
-                                    List list = new ArrayList();
-                                    for (Object o : ((Collection) value)) {
-                                        list.add(Enum.valueOf(fieldType, String.valueOf(o)));
-                                    }
-                                    and.add(root.get(property).in(list));
-                                }
-                            } else if (value instanceof String && StringUtils.isNotEmpty((String) value)) {
-                                if (((String) value).contains(",")) {
-                                    String[] arr = ((String) value).split(",");
-                                    List list = new ArrayList();
-                                    for (String s : arr) {
-                                        list.add(Enum.valueOf(fieldType, s));
-                                    }
-                                    and.add(root.get(property).in(list));
-                                } else {
-                                    and.add(criteriaBuilder.and(criteriaBuilder
-                                            .equal(root.get(property), Enum
-                                                    .valueOf(fieldType, String.valueOf(value)))));
-                                }
-                            }
-                        } else if (LocalDateTime.class == fieldType) {
-                            if (value instanceof List) {
-                                List list = (List) value;
-                                if (list.size() == 1) {
-                                    LocalDateTime start = DateTimeUtils
-                                            .toLocalDateTime((String) list.get(0), "yyyy-MM-dd HH:mm:ss");
-                                    and.add(criteriaBuilder.greaterThanOrEqualTo(root.get(property), start));
-                                } else if (list.size() == 2) {
-                                    LocalDateTime end = DateTimeUtils
-                                            .toLocalDateTime((String) list.get(1), "yyyy-MM-dd HH:mm:ss");
-                                    and.add(criteriaBuilder.lessThanOrEqualTo(root.get(property), end));
-                                }
-                            } else if (value instanceof String && Pattern
-                                    .matches("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}$", (String) value)) {
-                                String[] arr = ((String) value).split(",");
-                                LocalDateTime start = DateTimeUtils.toLocalDateTime(arr[0], "yyyy-MM-dd HH:mm:ss");
-                                and.add(criteriaBuilder.greaterThanOrEqualTo(root.get(property), start));
-                                LocalDateTime end = DateTimeUtils.toLocalDateTime(arr[1], "yyyy-MM-dd HH:mm:ss");
-                                and.add(criteriaBuilder.lessThanOrEqualTo(root.get(property), end));
-                            } else {
-                                and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), DateTimeUtils
-                                        .toLocalDateTime((String) value, "yyyy-MM-dd HH:mm:ss"))));
-                            }
-                        } else if (LocalDate.class == fieldType) {
-                            if (value instanceof List) {
-                                List list = (List) value;
-                                if (list.size() == 1) {
-                                    LocalDate start = DateTimeUtils
-                                            .toLocalDate((String) list.get(0), "yyyy-MM-dd");
-                                    and.add(criteriaBuilder.greaterThanOrEqualTo(root.get(property), start));
-                                } else if (list.size() == 2) {
-                                    LocalDate end = DateTimeUtils
-                                            .toLocalDate((String) list.get(1), "yyyy-MM-dd");
-                                    and.add(criteriaBuilder.lessThanOrEqualTo(root.get(property), end));
-                                }
-                            } else if (value instanceof String && Pattern
-                                    .matches("^\\d{4}-\\d{2}-\\d{2},\\d{4}-\\d{2}-\\d{2}$", (String) value)) {
-                                String[] arr = ((String) value).split(",");
-                                LocalDate start = DateTimeUtils.toLocalDate(arr[0], "yyyy-MM-dd");
-                                and.add(criteriaBuilder.greaterThanOrEqualTo(root.get(property), start));
-                                LocalDate end = DateTimeUtils.toLocalDate(arr[1], "yyyy-MM-dd");
-                                and.add(criteriaBuilder.lessThanOrEqualTo(root.get(property), end));
-                            } else {
-                                and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), DateTimeUtils
-                                        .toLocalDateTime((String) value, "yyyy-MM-dd"))));
-                            }
-                        } else {
-                            and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-
-                }
-            });
-            if (StringUtils.isNotEmpty(pageQuery.getSearch())) {
-                Field[] fields = queryClass.getDeclaredFields();
-                List<Predicate> or = new ArrayList<>();
-                try {
-                    or.add(criteriaBuilder.equal(root.get("id"), pageQuery.getSearch()));
-                } catch (Exception ignored) {
-                }
-                for (Field field : fields) {
-                    Searchable annotation = field.getAnnotation(Searchable.class);
-                    if (annotation == null) {
-                        continue;
-                    }
-                    if (!annotation.value()) {
-                        continue;
-                    }
-
-                    or.add(criteriaBuilder.like(root.get(field.getName()), "%" + pageQuery.getSearch() + "%"));
-                }
-                and.add(criteriaBuilder.or(or.toArray(new Predicate[0])));
-            }
-            return criteriaBuilder.and(and.toArray(new Predicate[0]));
-        };
-    }
-}

src/main/java/com/izouma/dingdong/service/user/CouponService.java → src/main/java/com/izouma/dingdong/service/CouponService.java

@@ -1,7 +1,6 @@
-package com.izouma.dingdong.service.user;
+package com.izouma.dingdong.service;
 
-import com.izouma.dingdong.domain.user.Coupon;
-import com.izouma.dingdong.repo.user.CouponRepo;
+import com.izouma.dingdong.repo.CouponRepo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

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

@@ -2,14 +2,15 @@ package com.izouma.dingdong.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.izouma.dingdong.domain.OrderGoodsSpec;
-import com.izouma.dingdong.domain.ShoppingCart;
 import com.izouma.dingdong.domain.merchant.Goods;
 import com.izouma.dingdong.domain.merchant.GoodsSpecification;
 import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.repo.OrderGoodsSpecRepo;
 import com.izouma.dingdong.repo.merchant.GoodsRepo;
 import com.izouma.dingdong.repo.merchant.GoodsSpecificationRepo;
+import com.izouma.dingdong.service.user.ShoppingCartService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -29,8 +30,8 @@ public class OrderGoodsSpecService {
     添加规格
      */
     public OrderGoodsSpec add(Long goodsId, List<GoodsSpecification> goodsSpecifications) {
-        String name = null;
-        String ids = null;
+        String spec = null;
+        //String ids = null;
         Goods goods = goodsRepo.findById(goodsId).orElseThrow(new BusinessException("无商品"));
         BigDecimal total = goods.getAmount();
         BigDecimal real = goods.getDiscountAmount();
@@ -51,23 +52,25 @@ public class OrderGoodsSpecService {
                 total = total.add(g.getAmount());
                 real = real.add(g.getAmount());
 
-                if (StrUtil.isNotBlank(name)) {
-                    name = name + "/" + g.getName();
-                } else {
-                    name = g.getName();
-                }
-                if (StrUtil.isNotBlank(ids)) {
-                    ids = ids + "/" + g.getId();
-                } else {
-                    ids = g.getId().toString();
-                }
-            }
+//                if (StrUtil.isNotBlank(name)) {
+//                    name = name + "/" + g.getName();
+//                } else {
+//                    name = g.getName();
+//                }
+//                if (StrUtil.isNotBlank(ids)) {
+//                    ids = ids + "/" + g.getId();
+//                } else {
+//                    ids = g.getId().toString();
+//                }
+             }
+            spec = JSONObject.toJSONString(goodsSpecifications);
+
         }
         return orderGoodsSpecRepo.save(
                 OrderGoodsSpec.builder()
                         .goodsId(goodsId)
-                        .specification(name)
-                        .specificationId(ids)
+                        .specification(spec)
+                        //.specificationId(ids)
                         .goodsPrice(total)
                         .goodsRealPrice(real)
                         .build());

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

@@ -1,17 +1,17 @@
 package com.izouma.dingdong.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.izouma.dingdong.converter.StringArrayConverter;
 import com.izouma.dingdong.domain.OrderInfo;
-import com.izouma.dingdong.domain.ShoppingCart;
+import com.izouma.dingdong.domain.user.ShoppingCart;
 import com.izouma.dingdong.domain.User;
 import com.izouma.dingdong.domain.merchant.Goods;
-import com.izouma.dingdong.domain.merchant.Merchant;
 import com.izouma.dingdong.domain.merchant.MerchantSettings;
 import com.izouma.dingdong.domain.user.Address;
-import com.izouma.dingdong.domain.user.Coupon;
+import com.izouma.dingdong.domain.Coupon;
+import com.izouma.dingdong.domain.user.UserCoupon;
 import com.izouma.dingdong.dto.UserOrderDTO;
 import com.izouma.dingdong.enums.MerchantStatus;
 import com.izouma.dingdong.enums.OrderStatus;
@@ -19,19 +19,18 @@ import com.izouma.dingdong.enums.RiderStatus;
 import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.repo.OrderGoodsSpecRepo;
 import com.izouma.dingdong.repo.OrderInfoRepo;
-import com.izouma.dingdong.repo.ShoppingCartRepo;
+import com.izouma.dingdong.repo.user.ShoppingCartRepo;
 import com.izouma.dingdong.repo.UserRepo;
 import com.izouma.dingdong.repo.merchant.GoodsRepo;
 import com.izouma.dingdong.repo.merchant.MerchantRepo;
 import com.izouma.dingdong.repo.merchant.MerchantSettingsRepo;
 import com.izouma.dingdong.repo.user.AddressRepo;
-import com.izouma.dingdong.repo.user.CouponRepo;
+import com.izouma.dingdong.repo.CouponRepo;
+import com.izouma.dingdong.repo.user.UserCouponRepo;
 import com.izouma.dingdong.service.merchant.GoodsService;
 import com.izouma.dingdong.service.merchant.MerchantService;
-import com.izouma.dingdong.service.merchant.MerchantSettingsService;
 import com.izouma.dingdong.service.merchant.SalesService;
 import lombok.AllArgsConstructor;
-import me.chanjar.weixin.mp.bean.card.enums.BusinessServiceType;
 import org.springframework.stereotype.Service;
 
 import java.time.DayOfWeek;
@@ -56,6 +55,7 @@ public class OrderInfoService {
     private MerchantService merchantService;
     private SalesService salesService;
     private MerchantRepo merchantRepo;
+    private UserCouponRepo userCouponRepo;
 
     /*
     用户下单
@@ -90,28 +90,38 @@ public class OrderInfoService {
         orderInfo.setOrderTime(now);
         orderInfo.setEnabled(true);
 
-        //使用优惠券(满减优惠券)
-        if (ObjectUtil.isNotNull(userOrderDTO.getCouponId())) {
-            Coupon coupon = couponRepo.findById(userOrderDTO.getCouponId()).orElseThrow(new BusinessException("优惠券不存在"));
+        //用户地址
+        Address address = addressRepo.findById(userOrderDTO.getAddressId()).orElseThrow(new BusinessException("地址不存在"));
+        //orderInfo.setUserAddress(address.getAddressName());
+        orderInfo.setUserAddress(JSONObject.toJSONString(address));
+
+       // 使用优惠券(满减优惠券)
+        if (ObjectUtil.isNotNull(userOrderDTO.getUserCouponId())) {
+            //Coupon coupon = couponRepo.findById(userOrderDTO.getCouponId()).orElseThrow(new BusinessException("优惠券不存在"));
+            UserCoupon userCoupon = userCouponRepo.findById(userOrderDTO.getUserCouponId()).orElseThrow(new BusinessException("无此优惠券"));
+            Coupon coupon = couponRepo.findById(userCoupon.getCouponId()).orElseThrow(new BusinessException("优惠券不存在"));
             //未过期，未使用
-            if (coupon.getEndDate().isAfter(now.toLocalDate()) && !coupon.getIsUsed()) {
+            if (coupon.getEndDate().isAfter(now.toLocalDate()) && !userCoupon.getIsUsed()) {
+                //判断是否限制手机号
+                if (ObjectUtil.isNotNull(userCoupon.getPhone())) {
+                    if (!address.getPhone().equals(userCoupon.getPhone())){
+                        throw new BusinessException("限手机"+userCoupon.getPhone()+"使用");
+                    }
+                }
+
                 if (coupon.getFullAmount().compareTo(cart.getGoodsTotal()) <= 0) {
                     //订单金额，优惠券Id
                     orderInfo.setPackingPrice(coupon.getAmount());
-                    orderInfo.setCouponId(coupon.getId());
+                    orderInfo.setUserCouponId(userCoupon.getId());
                     orderInfo.setRealAmount(orderInfo.getRealAmount().subtract(orderInfo.getPackingPrice()));
 
-                    coupon.setIsUsed(true);
-                    coupon.setUsedTime(now);
-                    couponRepo.save(coupon);
+                    userCoupon.setIsUsed(true);
+                    userCoupon.setUsedTime(now);
+                    userCouponRepo.save(userCoupon);
                 }
             }
         }
 
-        //用户地址
-        Address address = addressRepo.findById(userOrderDTO.getAddressId()).orElseThrow(new BusinessException("地址不存在"));
-        orderInfo.setUserAddress(address.getAddressName());
-
         OrderInfo save = orderInfoRepo.save(orderInfo);
 
         cart.getOrderGoodsSpecs().forEach(s -> {
@@ -218,8 +228,10 @@ public class OrderInfoService {
      */
     public void carryOut(Long orderId, Boolean next) {
         if (next) {
-            //userRepo.findById(userId).orElseThrow(new BusinessException("无用户"));
+
             OrderInfo orderInfo = orderInfoRepo.findById(orderId).orElseThrow(new BusinessException("无订单"));
+            //按商户Id找出用户
+            User userMer = userRepo.findById(merchantRepo.findUserIdById(orderInfo.getMerchantId())).orElseThrow(new BusinessException("无用户"));
 
             if (MerchantStatus.RECEIVED.equals(orderInfo.getMerchantStatus())) {
                 RiderStatus riderStatus = orderInfo.getRiderStatus();
@@ -239,11 +251,13 @@ public class OrderInfoService {
 
                         //扣除金额
 
-                        //商家
-                        Merchant merchant = merchantRepo.findById(orderInfo.getMerchantId()).orElseThrow(new BusinessException("商家不存在"));
-                        merchant.setMoney(merchant.getMoney().add(orderInfo.getRealAmount().subtract(orderInfo.getDeliveryAmount())));
+                        //商家应得
+//                        Merchant merchant = merchantRepo.findById(orderInfo.getMerchantId()).orElseThrow(new BusinessException("商家不存在"));
+//                        merchant.setMoney(merchant.getMoney().add(orderInfo.getRealAmount().subtract(orderInfo.getDeliveryAmount())));
+                        userMer.setMoney(userMer.getMoney().add(orderInfo.getRealAmount().subtract(orderInfo.getDeliveryAmount())));
+                        userRepo.save(userMer);
 
-                        //骑手
+                        //骑手应得
 
 
                         break;

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

@@ -24,6 +24,7 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -53,6 +54,7 @@ public class UserService {
                     .phone(phone)
                     .authorities(Collections.singleton(Authority.getInstance(Authority.NAMES.ROLE_USER)))
                     .identity(identity)
+                    .money(BigDecimal.ZERO)
                     .build();
         } else {
             user.setPassword(new BCryptPasswordEncoder().encode(password));

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

@@ -0,0 +1,89 @@
+package com.izouma.dingdong.service;
+
+
+import com.izouma.dingdong.domain.BankCard;
+import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.domain.WithdrawApply;
+import com.izouma.dingdong.domain.merchant.Merchant;
+import com.izouma.dingdong.enums.Identity;
+import com.izouma.dingdong.enums.WithdrawStatus;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.BankCardRepo;
+import com.izouma.dingdong.repo.UserRepo;
+import com.izouma.dingdong.repo.WithdrawalsApplyRepo;
+import com.izouma.dingdong.repo.merchant.MerchantRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+
+@AllArgsConstructor
+@Service
+public class WithdrawApplyService {
+
+    private WithdrawalsApplyRepo withdrawalsApplyRepo;
+    private UserRepo userRepo;
+    private BankCardRepo bankCardRepo;
+
+    /*
+    提现申请
+     */
+    @Transactional
+    public WithdrawApply apply(Long userId, BigDecimal amount, Long bankCardId) {
+        if (BigDecimal.ZERO.compareTo(amount) <= 0) {
+            throw new BusinessException("提现金额小于等于0");
+        }
+
+        User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
+        BankCard bankCard = bankCardRepo.findById(bankCardId).orElseThrow(new BusinessException("银行卡信息不存在"));
+
+        if (BigDecimal.ZERO.compareTo(user.getMoney()) <= 0) {
+            throw new BusinessException("当前可提现金额小于等于0");
+        }
+        if (amount.compareTo(user.getMoney()) > 0) {
+            throw new BusinessException("提现金额大于余额");
+        }
+
+        WithdrawApply apply = WithdrawApply.builder()
+                .amount(amount)
+                .bankCardId(bankCardId)
+                .cardNo(bankCard.getCardNo())
+                .status(WithdrawStatus.PENDING)
+                .userId(userId)
+                .withdrawTime(LocalDateTime.now())
+                .build();
+
+        return withdrawalsApplyRepo.save(apply);
+
+    }
+
+    /*
+    申请是否成功
+    */
+    @Transactional
+    public WithdrawApply audit(Long withdrawalsId, Boolean consent) {
+        WithdrawApply withdrawals = withdrawalsApplyRepo.findById(withdrawalsId).orElseThrow(new BusinessException("无此申请记录"));
+        if (consent == null) {
+            throw new BusinessException("操作错误");
+        }
+        if (consent) {
+            withdrawals.setConsent(true);
+            withdrawals.setStatus(WithdrawStatus.SUCCESS);
+
+            //人工提现，设置余额
+            User user = userRepo.findById(withdrawals.getUserId()).orElseThrow(new BusinessException("无用户"));
+            user.setMoney(user.getMoney().subtract(withdrawals.getAmount()));
+            userRepo.save(user);
+
+        } else {
+            withdrawals.setConsent(false);
+            withdrawals.setStatus(WithdrawStatus.FAIL);
+        }
+        withdrawals.setAuditTime(LocalDateTime.now());
+        return withdrawalsApplyRepo.save(withdrawals);
+    }
+
+}

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

@@ -27,6 +27,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -52,7 +53,7 @@ public class MerchantService {
      */
     public MerchantDTO registerApply(MerchantDTO merchantDTO) {
         //注册商家用户
-       // User user = userService.register(merchantDTO.getPhone(), merchantDTO.getPassword());
+        // User user = userService.register(merchantDTO.getPhone(), merchantDTO.getPassword());
         User user = userRepo.findByPhone(merchantDTO.getPhone());
 
 
@@ -61,10 +62,12 @@ public class MerchantService {
 
         if (ObjectUtil.isNotNull(merchant1)) {
             if (merchant1.getStatus().equals(ApplyStatus.PENDING)) {
-                throw new BusinessException("申请中");
+                return merchantDTO;
+                //throw new BusinessException("申请中");
             }
             if (merchant1.getStatus().equals(ApplyStatus.PASS)) {
-                throw new BusinessException("已申请");
+                return merchantDTO;
+                //throw new BusinessException("已申请");
             }
         }
 
@@ -87,9 +90,10 @@ public class MerchantService {
         BeanUtil.copyProperties(merchantDTO, merchant);
         merchant.setUserId(user.getId());
         merchant.setStatus(ApplyStatus.PENDING);
-        merchant.setGoodNum(0);
-        merchant.setBadNum(0);
-        merchant.setMonthSales(0);
+        // merchant.setGoodNum(0);
+//        merchant.setBadNum(0);
+//        merchant.setMonthSales(0);
+
         merchant.setEnabled(true);
         merchant.setBlacklist(false);
         merchant = merchantRepo.save(merchant);
@@ -97,6 +101,15 @@ public class MerchantService {
         //dto转merchantSettings实体
         BeanUtil.copyProperties(merchantDTO, merchantSettings);
         merchantSettings.setMerchantId(merchant.getId());
+
+        //新用户和首单金额未设置时
+        if (ObjectUtil.isNull(merchantDTO.getNewUser())) {
+            merchantSettings.setNewUser(BigDecimal.ZERO);
+        }
+        if (ObjectUtil.isNull(merchantDTO.getFirstOrder())) {
+            merchantSettings.setFirstOrder(BigDecimal.ZERO);
+        }
+
         merchantSettings.setEnabled(true);
         merchantSettings.setIsOpening(true);
 

src/main/java/com/izouma/dingdong/service/ShoppingCartService.java → src/main/java/com/izouma/dingdong/service/user/ShoppingCartService.java

@@ -1,29 +1,26 @@
-package com.izouma.dingdong.service;
+package com.izouma.dingdong.service.user;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.izouma.dingdong.domain.OrderGoodsSpec;
 import com.izouma.dingdong.domain.OrderInfo;
-import com.izouma.dingdong.domain.ShoppingCart;
-import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.domain.user.ShoppingCart;
 import com.izouma.dingdong.domain.merchant.FullReduction;
 import com.izouma.dingdong.domain.merchant.Goods;
 import com.izouma.dingdong.domain.merchant.MerchantSettings;
 import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.repo.OrderGoodsSpecRepo;
 import com.izouma.dingdong.repo.OrderInfoRepo;
-import com.izouma.dingdong.repo.ShoppingCartRepo;
+import com.izouma.dingdong.repo.user.ShoppingCartRepo;
 import com.izouma.dingdong.repo.UserRepo;
 import com.izouma.dingdong.repo.merchant.FullReductionRepo;
 import com.izouma.dingdong.repo.merchant.GoodsRepo;
-import com.izouma.dingdong.repo.merchant.MerchantRepo;
 import com.izouma.dingdong.repo.merchant.MerchantSettingsRepo;
 import com.izouma.dingdong.service.merchant.GoodsService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 

src/main/java/com/izouma/dingdong/service/user/UserCouponService.java

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.service.user;
+
+import com.izouma.dingdong.domain.user.UserCoupon;
+import com.izouma.dingdong.repo.user.UserCouponRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class UserCouponService {
+
+    private UserCouponRepo userCouponRepo;
+
+}

src/main/java/com/izouma/dingdong/web/BankCardController.java

@@ -0,0 +1,69 @@
+package com.izouma.dingdong.web;
+import com.izouma.dingdong.domain.BankCard;
+import com.izouma.dingdong.service.BankCardService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.BankCardRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.SecurityUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+import io.swagger.annotations.ApiOperation;
+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("/bankCard")
+@AllArgsConstructor
+public class BankCardController extends BaseController {
+    private BankCardService bankCardService;
+    private BankCardRepo bankCardRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public BankCard save(@RequestBody BankCard record) {
+        if (record.getId() != null) {
+            BankCard orig = bankCardRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return bankCardRepo.save(orig);
+        }
+        return bankCardRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<BankCard> all(PageQuery pageQuery) {
+        return bankCardRepo.findAll(toSpecification(pageQuery,BankCard.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public BankCard get(@PathVariable Long id) {
+        return bankCardRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        bankCardRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<BankCard> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @GetMapping("/my")
+    @ApiOperation("我的银行卡信息(包括商家和骑手)")
+    public List<BankCard> my(){
+        return bankCardRepo.findAllByUserId(SecurityUtils.getAuthenticatedUser().getId());
+    }
+
+}
+

src/main/java/com/izouma/dingdong/web/user/CouponController.java → src/main/java/com/izouma/dingdong/web/CouponController.java

@@ -1,21 +1,21 @@
-package com.izouma.dingdong.web.user;
+package com.izouma.dingdong.web;
 
 import com.izouma.dingdong.web.BaseController;
-import com.izouma.dingdong.domain.user.Coupon;
-import com.izouma.dingdong.service.user.CouponService;
+import com.izouma.dingdong.domain.Coupon;
+import com.izouma.dingdong.service.CouponService;
 import com.izouma.dingdong.dto.PageQuery;
 import com.izouma.dingdong.exception.BusinessException;
-import com.izouma.dingdong.repo.user.CouponRepo;
+import com.izouma.dingdong.repo.CouponRepo;
 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.math.BigDecimal;
 import java.util.List;
 
 @RestController

src/main/java/com/izouma/dingdong/web/UserController.java

@@ -108,6 +108,8 @@ public class UserController extends BaseController {
         Map<String, Object> query = pageQuery.getQuery();
         //只查找身份为user的
         query.put("identity","USER");
+        //拉入黑名单的不显示
+        query.put("blacklist","false");
         pageQuery.setQuery(query);
         return userRepo.findAll(toSpecification(pageQuery, User.class), toPageRequest(pageQuery));
     }

src/main/java/com/izouma/dingdong/web/ShoppingCartController.java → src/main/java/com/izouma/dingdong/web/user/ShoppingCartController.java

@@ -1,17 +1,18 @@
-package com.izouma.dingdong.web;
+package com.izouma.dingdong.web.user;
 
 import com.izouma.dingdong.domain.OrderGoodsSpec;
-import com.izouma.dingdong.domain.ShoppingCart;
+import com.izouma.dingdong.domain.user.ShoppingCart;
 
 import com.izouma.dingdong.domain.merchant.GoodsSpecification;
 import com.izouma.dingdong.service.OrderGoodsSpecService;
-import com.izouma.dingdong.service.ShoppingCartService;
+import com.izouma.dingdong.service.user.ShoppingCartService;
 import com.izouma.dingdong.dto.PageQuery;
 import com.izouma.dingdong.exception.BusinessException;
-import com.izouma.dingdong.repo.ShoppingCartRepo;
+import com.izouma.dingdong.repo.user.ShoppingCartRepo;
 import com.izouma.dingdong.utils.ObjUtils;
 import com.izouma.dingdong.utils.SecurityUtils;
 import com.izouma.dingdong.utils.excel.ExcelUtils;
+import com.izouma.dingdong.web.BaseController;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;

src/main/java/com/izouma/dingdong/web/user/UserCouponController.java

@@ -0,0 +1,74 @@
+package com.izouma.dingdong.web.user;
+
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.user.UserCoupon;
+import com.izouma.dingdong.service.user.UserCouponService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.user.UserCouponRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+
+import io.swagger.annotations.ApiOperation;
+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("/userCoupon")
+@AllArgsConstructor
+public class UserCouponController extends BaseController {
+    private UserCouponService userCouponService;
+    private UserCouponRepo userCouponRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public UserCoupon save(@RequestBody UserCoupon record) {
+        if (record.getId() != null) {
+            UserCoupon orig = userCouponRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return userCouponRepo.save(orig);
+        }
+        return userCouponRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<UserCoupon> all(PageQuery pageQuery) {
+        return userCouponRepo.findAll(toSpecification(pageQuery,UserCoupon.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public UserCoupon get(@PathVariable Long id) {
+        return userCouponRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        userCouponRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<UserCoupon> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @ApiOperation("后台发放优惠券")
+    @GetMapping("/issue")
+    public void issue(Long userId,Long couponId){
+        UserCoupon.builder()
+                .couponId(couponId)
+                .isUsed(false)
+                .userId(userId)
+                .build();
+    }
+}
+

src/main/resources/genjson/BankCard.json

@@ -0,0 +1 @@
+{"tableName":"BankCard","className":"BankCard","remark":"银行卡号","genTable":true,"genClass":true,"genList":false,"genForm":false,"genRouter":false,"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":"userId","modelName":"userId","remark":"用户ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"realName","modelName":"realName","remark":"真实姓名","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"phone","modelName":"phone","remark":"电话","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"idNo","modelName":"idNo","remark":"身份证","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"bankName","modelName":"bankName","remark":"银行","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"cardNo","modelName":"cardNo","remark":"卡号","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"enabled","modelName":"enabled","remark":"enabled","showInList":true,"showInForm":true,"formType":"switch"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.dingdong","tablePackage":"com.izouma.dingdong.domain.BankCard"}

src/main/resources/genjson/userCoupon.json

@@ -0,0 +1 @@
+{"tableName":"userCoupon","className":"userCoupon","remark":"用户优惠券","genTable":true,"genClass":true,"genList":false,"genForm":false,"genRouter":false,"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":"userId","modelName":"userId","remark":"用户ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"couponId","modelName":"couponId","remark":"优惠券ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"isUsed","modelName":"isUsed","remark":"是否已使用","showInList":true,"showInForm":true,"formType":"switch"},{"name":"usedTime","modelName":"usedTime","remark":"使用时间","showInList":true,"showInForm":true,"formType":"datetime"},{"name":"phone","modelName":"phone","remark":"手机号","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.dingdong","tablePackage":"com.izouma.dingdong.domain.user.userCoupon","genPackage":"user"}

src/main/vue/src/views/CouponEdit.vue

@@ -2,9 +2,6 @@
     <div class="edit-view">
         <el-form :model="formData" :rules="rules" ref="form" label-width="94px" label-position="right" size="small"
                  style="max-width: 500px;">
-                <el-form-item prop="userId" label="用户ID">
-                            <el-input-number type="number" v-model="formData.userId"></el-input-number>
-                </el-form-item>
                 <el-form-item prop="name" label="优惠券名称">
                             <el-input v-model="formData.name"></el-input>
                 </el-form-item>
@@ -27,31 +24,26 @@
                                     placeholder="选择日期">
                             </el-date-picker>
                 </el-form-item>
-                <el-form-item prop="isExpired" label="是否过期">
-                            <el-switch v-model="formData.isExpired"></el-switch>
-                </el-form-item>
-                <el-form-item prop="isUsed" label="是否已使用">
-                            <el-switch v-model="formData.isUsed"></el-switch>
-                </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="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="fullAmount" label="满额">
                             <el-input-number type="number" v-model="formData.fullAmount"></el-input-number>
                 </el-form-item>
-                <el-form-item prop="discount" label="折扣">
-                            <el-input-number type="number" v-model="formData.discount"></el-input-number>
-                </el-form-item>
-                <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="discount" label="折扣">-->
+<!--                            <el-input-number type="number" v-model="formData.discount"></el-input-number>-->
+<!--                </el-form-item>-->
+<!--                <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>
                 <el-button @click="onSave" :loading="saving"
                            type="primary">保存</el-button>

src/main/vue/src/views/CouponList.vue

@@ -23,9 +23,6 @@
             </el-table-column>
             <el-table-column prop="id" label="ID" width="100">
             </el-table-column>
-                                <el-table-column prop="userId" label="用户ID"
->
-                    </el-table-column>
                     <el-table-column prop="name" label="优惠券名称"
 >
                     </el-table-column>
@@ -40,28 +37,23 @@
                             :formatter="dateFormatter"
 >
                     </el-table-column>
-                    <el-table-column prop="isExpired" label="是否过期"
+<!--                    <el-table-column prop="isExpired" label="是否过期"
 >
                             <template slot-scope="{row}">
                                 <el-tag :type="row.isExpired?'':'info'">{{row.isExpired}}</el-tag>
                             </template>
-                    </el-table-column>
-                    <el-table-column prop="isUsed" label="是否已使用"
->
-                            <template slot-scope="{row}">
-                                <el-tag :type="row.isUsed?'':'info'">{{row.isUsed}}</el-tag>
-                            </template>
-                    </el-table-column>
-                    <el-table-column prop="type" label="优惠券类型"
-                            :formatter="typeFormatter"
-                        >
-                    </el-table-column>
+                    </el-table-column>-->
+
+<!--                    <el-table-column prop="type" label="优惠券类型"-->
+<!--                            :formatter="typeFormatter"-->
+<!--                        >-->
+<!--                    </el-table-column>-->
                     <el-table-column prop="fullAmount" label="满额"
 >
                     </el-table-column>
-                    <el-table-column prop="discount" label="折扣"
->
-                    </el-table-column>
+<!--                    <el-table-column prop="discount" label="折扣"-->
+<!--&gt;-->
+<!--                    </el-table-column>-->
                     <el-table-column prop="merchantId" label="商家ID"
 >
                     </el-table-column>

src/main/vue/src/views/MerchantSettingsEdit.vue

@@ -1,125 +0,0 @@
-<template>
-    <div class="edit-view">
-        <el-form :model="formData" :rules="rules" ref="form" label-width="94px" 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="address" label="商户地址">
-                            <el-input v-model="formData.address"></el-input>
-                </el-form-item>
-                <el-form-item prop="firstOrder" label="首单优惠">
-                            <el-input-number type="number" v-model="formData.firstOrder"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="newUser" label="新用户优惠">
-                            <el-input-number type="number" v-model="formData.newUser"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="category" label="经营品类">
-                            <el-input v-model="formData.category"></el-input>
-                </el-form-item>
-                <el-form-item prop="tag" label="标签">
-                            <el-input v-model="formData.tag"></el-input>
-                </el-form-item>
-                <el-form-item prop="startTime" label="营业时间">
-                            <el-date-picker
-                                    v-model="formData.startTime"
-                                    type="datetime"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    placeholder="选择日期时间">
-                            </el-date-picker>
-                </el-form-item>
-                <el-form-item prop="endTime" label="营业时间">
-                            <el-date-picker
-                                    v-model="formData.endTime"
-                                    type="datetime"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    placeholder="选择日期时间">
-                            </el-date-picker>
-                </el-form-item>
-                <el-form-item prop="qualification" label="营业资质">
-                            <multi-upload v-model="formData.qualification"></multi-upload>
-                </el-form-item>
-                <el-form-item prop="businessNature" label="营业性质">
-                            <el-input v-model="formData.businessNature"></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: 'MerchantSettingsEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('merchantSettings/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('/merchantSettings/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(`/merchantSettings/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/MerchantSettingsList.vue

@@ -1,198 +0,0 @@
-<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>
-            <el-button @click="download" type="primary" icon="el-icon-download"
-                       :loading="downloading" class="filter-item">导出EXCEL
-            </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="address" label="商户地址"
->
-                    </el-table-column>
-                    <el-table-column prop="firstOrder" label="首单优惠"
->
-                    </el-table-column>
-                    <el-table-column prop="newUser" label="新用户优惠"
->
-                    </el-table-column>
-                    <el-table-column prop="category" label="经营品类"
->
-                    </el-table-column>
-                    <el-table-column prop="tag" label="标签"
->
-                    </el-table-column>
-                    <el-table-column prop="startTime" label="营业时间"
-                            :formatter="datetimeFormatter"
->
-                    </el-table-column>
-                    <el-table-column prop="endTime" label="营业时间"
-                            :formatter="datetimeFormatter"
->
-                    </el-table-column>
-                    <el-table-column prop="qualification" label="营业资质"
->
-                            <template slot-scope="{row}">
-                                <el-image style="width: 30px; height: 30px"
-                                          :src="row.qualification[0]" fit="cover"
-                                          :preview-src-list="row.qualification"></el-image>
-                            </template>
-                    </el-table-column>
-                    <el-table-column prop="businessNature" label="营业性质"
->
-                    </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: 'MerchantSettingsList',
-        mixins: [pageableTable],
-        created() {
-            this.getData();
-        },
-        data() {
-            return {
-                multipleMode: false,
-                search: "",
-                url: "/merchantSettings/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: "/merchantSettingsEdit",
-                    query: {
-                    ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/merchantSettingsEdit",
-                    query: {
-                    id: row.id
-                    }
-                });
-            },
-            download() {
-                this.downloading = true;
-                this.$axios
-                    .get("/merchantSettings/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(`/merchantSettings/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/UserEdit.vue

@@ -38,6 +38,9 @@
                 <el-button @click="showSetLogistics=true"
                            type="danger" v-if="formData.id && !formData.blacklist">移入黑名单
                 </el-button>
+                <el-button @click=""
+                           type="danger" v-if="formData.id && formData.blacklist">移出黑名单
+                </el-button>
                 <el-button @click="" :loading="$store.state.fetchingData"
                            type="primary" v-if="formData.id">发送优惠券
                 </el-button>
@@ -51,7 +54,7 @@
                 width="400px"
                 :visible.sync="showSetLogistics"
         >
-            <el-form>
+            <el-form :model="formData">
                 <el-form-item>
                     <el-input type="textarea"
                               placeholder="请输入拉入黑名单理由"
@@ -59,10 +62,17 @@
                     ></el-input>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="move" size="mini">确认</el-button>
+                    <el-button type="primary" @click="moveRow(formData.id)" size="mini">确认</el-button>
                 </el-form-item>
             </el-form>
         </el-dialog>
+
+        <el-dialog>
+            <el-table>
+
+            </el-table>
+
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -179,7 +189,7 @@
                     .catch(() => {
                     });
             },
-            move() {
+            moveRow(id) {
                 /*this.$confirm('确认移入黑名单吗？', '提示', {type: 'warning'})
                     .then(() => {
                         this.$http
@@ -204,7 +214,7 @@
                 this.$http
                     .post({
                         url: "/blacklist/move", data: {
-                            id: this.formData.id,
+                            id: id,
                             reason: this.reason,
                         },
                     })

src/main/vue/src/views/merchant/MerchantList.vue

@@ -23,15 +23,12 @@
             </el-table-column>
             <el-table-column prop="mid" label="ID" width="100">
             </el-table-column>
-            <!--           <el-table-column prop="userId" label="用户ID"
-                       >
-                       </el-table-column>-->
             <el-table-column prop="logo" label="Logo"
             >
                 <template slot-scope="{row}">
                     <el-image style="width: 30px; height: 30px"
                               :src="row.logo" fit="cover"
-                              :preview-src-list="row.logo"></el-image>
+                              :preview-src-list="[row.logo]"></el-image>
                 </template>
             </el-table-column>
             <el-table-column prop="name" label="名称"
@@ -100,8 +97,8 @@
             <el-table-column label="操作" align="center" fixed="right" min-width="250">
                 <template slot-scope="{ row }">
                     <el-button @click="showDrawer(row)" type="primary" size="mini" plain>详情</el-button>
-                    <el-button @click="" type="primary" size="mini" plain>报表</el-button>
-                    <el-button @click="" type="primary" size="mini" plain>评价</el-button>
+                    <el-button @click="" type="primary" size="mini" plain v-if="row.isPass">报表</el-button>
+                    <el-button @click="" type="primary" size="mini" plain v-if="row.isPass">评价</el-button>
                     <el-button
                             v-if="row.status === 'PENDING'"
                             :loading="row.loading"
@@ -155,18 +152,18 @@
                 </div>
                 <div class="info-item">名称：{{formData.name}}</div>
                 <div class="info-item">显示名称：{{formData.showName}}</div>
-                <div class="info-item">横幅：
-                    <el-image style="width: 60px; height: 30px"
-                              :src="formData.banner" fit="cover"
-                              :preview-src-list="[formData.banner]"/>
-                </div>
+<!--                <div class="info-item">横幅：-->
+<!--                    <el-image style="width: 60px; height: 30px"-->
+<!--                              :src="formData.banner" fit="cover"-->
+<!--                              :preview-src-list="[formData.banner]"/>-->
+<!--                </div>-->
                 <div class="info-item">电话：{{formData.phone}}</div>
                 <div class="info-item">简介：{{formData.introduction}}</div>
-                <div class="info-item">图片：
-                    <el-image style="width: 60px; height: 30px"
-                              :src="formData.img[0]" fit="cover"
-                              :preview-src-list="[formData.img]"/>
-                </div>
+<!--                <div class="info-item">图片：-->
+<!--                    <el-image style="width: 60px; height: 30px"-->
+<!--                              :src="formData.img[0]" fit="cover"-->
+<!--                              :preview-src-list="[formData.img]"/>-->
+<!--                </div>-->
                 <div class="info-item">地址：{{formData.address}}</div>
                 <div class="info-item">成立时间：{{formData.establishTime}}</div>
                 <div class="info-item">营业资质：{{formData.qualification}}</div>
@@ -175,16 +172,9 @@
                 <div class="info-item">营业：{{formData.week}}</div>
                 <div class="info-item">营业时间：{{formData.startTime}} - {{formData.endTime}}</div>
                 <!--                <div class="info-item">申请状态：{{formData.status}}</div>-->
-                <el-button
-                        v-if="formData.blacklist === false"
-                        :loading="formData.loading"
-                        @click="audit(formData.mid, true)"
-                        type="primary"
-                        size="mini"
-                        plain
-                >黑名单
-                </el-button
-                >
+                <el-button @click="showSetLogistics=true"
+                           type="danger" v-if="formData.mid && !formData.blacklist">移入黑名单
+                </el-button>
                 <el-button @click="editRow(formData)" type="primary" size="mini" plain>编辑</el-button>
                 <el-button @click="deleteRow(formData)" type="danger" size="mini" plain>删除</el-button>
             </div>
@@ -214,8 +204,10 @@
                 status: '',
                 drawer: false,
                 formData: {
-                    img: []
-                }
+                    img: [],
+                    category: {}
+                },
+                showSetLogistics: false,
             }
         },
         computed: {
@@ -230,7 +222,6 @@
                     .get('merchant/getDTO/' + row.mid)
                     .then(res => {
                         this.formData = res;
-
                     })
                     .catch(e => {
                         console.log(e);