筛选已通过商品

src/main/java/com/izouma/dingdong/config/Constants.java

@@ -15,8 +15,6 @@ public interface Constants {
 
     String SMS_TEMPLATE_CODE_GENERIC = "SMS_175485688";
 
-    String DEFAULT_LOGO = "";
-
     String CLASSIFICATION_NAME = "好评热销";
 
     String CLASSIFICATION_NAME2 = "折扣";

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

@@ -45,10 +45,10 @@ public class Address extends BaseEntity implements Serializable {
     private Boolean isDefault;
 
     @ApiModelProperty(value = "经度", name = "longitude")
-    private BigDecimal longitude;
+    private Double longitude;
 
     @ApiModelProperty(value = "纬度",name = "latitude")
-    private BigDecimal latitude;
+    private Double latitude;
 
     @Column(nullable = false)
     private Boolean enabled = true;

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

@@ -57,10 +57,7 @@ public class OrderInfoService {
     private MerchantRepo merchantRepo;
     private UserCouponRepo userCouponRepo;
     private OrderRefundApplyService orderRefundApplyService;
-    private SysConfigRepo sysConfigRepo;
     private RiderRepo riderRepo;
-    private RiderService riderService;
-    private MerchantSettingsService merchantSettingsService;
 
     /*
     用户下单
@@ -101,11 +98,12 @@ public class OrderInfoService {
         orderInfo.setOrderTime(now);
         orderInfo.setEnabled(true);
 
-        //如果未设置预计到达为30分钟
+        //如果未设置预计到达为15分钟
         if (ObjectUtil.isEmpty(merchantSettings.getPreparationTime())) {
-            merchantSettings.setPreparationTime(30L);
+            merchantSettings.setPreparationTime(15L);
         }
         //预计送达时间
+        //商家准备时间 + 骑手到商家的距离（因为用户下单时，骑手不知，所以为固定时间） + 用户到商家的时间
         orderInfo.setTimeOfArrival(LocalDateTime.now().plusMinutes(merchantSettings.getPreparationTime()));
 
         //用户地址

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

@@ -270,7 +270,7 @@ public class GoodsService {
         //用户3km以内的商品
         List<Goods> goodsList = new ArrayList<>();
         for (MerchantDTO d:dtos){
-            goodsList.addAll(goodsRepo.findAllByMerchantId(d.getMid()));
+            goodsList.addAll(goodsRepo.findAllByMerchantIdAndIsPassTrue(d.getMid()));
         }
 
         List<Goods> all = new ArrayList<>();

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

@@ -448,7 +448,7 @@ public class MerchantService {
 
     //带距离的商家
     public List<MerchantDTO> withDistance(Set<Merchant> merchants, Double longitude, Double latitude, Double range) {
-        Map<Merchant, Double> merchantMap = this.distanceSorting(merchants, longitude, latitude, null);
+        Map<Merchant, Double> merchantMap = this.distanceSorting(merchants, longitude, latitude, range);
         List<MerchantDTO> dtos = new ArrayList<>();
         for (Map.Entry<Merchant, Double> m : merchantMap.entrySet()) {
             merchantSettingsRepo.findByMerchantId(m.getKey().getId()).ifPresent(s -> dtos.add(new MerchantDTO(m.getKey(), s, m.getValue())));