骑手注册/订单加上地址经纬度

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

@@ -24,6 +24,13 @@ public class OrderInfo extends BaseEntity {
     @ApiModelProperty(value = "用户ID", name = "userId")
     private Long userId;
 
+    @ApiModelProperty(value = "用户昵称")
+    private String nickname;
+
+    //经度在前 纬度在后
+    @ApiModelProperty(value = "用户地址经纬度",name = "location")
+    private String location;
+
     @Enumerated(EnumType.STRING)
     @ApiModelProperty(value = "订单状态", name = "orderStatus")
     private OrderStatus status;
@@ -97,6 +104,7 @@ public class OrderInfo extends BaseEntity {
     @ApiModelProperty(value = "下单时间", name = "orderTime")
     private LocalDateTime orderTime;
 
+    @ApiModelProperty(value = "用户地址Id",name = "addressId")
     private Long addressId;
 
     @ApiModelProperty(value = "配送地址", name = "userAddress")
@@ -151,5 +159,7 @@ public class OrderInfo extends BaseEntity {
 
     //不显示的骑手列表
 //    private String NotDisplayRiderIds;
+    @ApiModelProperty(value = "期望送达时间段")
+    private String expectDeliveryTime;
 
 }

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

@@ -2,6 +2,7 @@ package com.izouma.dingdong.domain.rider;
 
 import com.izouma.dingdong.domain.BaseEntity;
 import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.enums.ApplyStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -24,43 +25,28 @@ public class Rider extends BaseEntity {
     private Long userId;
 
     @ApiModelProperty(value = "工号", name = "jobNumber")
-    private Long jobNumber;
+    private String jobNumber;
 
-    @ApiModelProperty(value = "区域", name = "area")
+    @ApiModelProperty(value = "工作地点", name = "area")
     private String area;
 
-    @ApiModelProperty(value = "签到", name = "signIn")
-    private Boolean signIn;
+    @ApiModelProperty(value = "经度", name = "longitude")
+    private Double longitude;
 
-    @ApiModelProperty(value = "准点率", name = "punctualityRate")
-    private Double punctualityRate;
+    @ApiModelProperty(value = "纬度", name = "latitude")
+    private Double latitude;
 
-//    @ApiModelProperty(value = "经验值", name = "experience")
-//    private String experience;
-
-//    @ApiModelProperty(value = "等级", name = "level")
-//    private int level;
-
-//    @ApiModelProperty(value = "货币", name = "monetary")
-//    private BigDecimal monetary;
+//    @ApiModelProperty(value = "签到", name = "signIn")
+//    private Boolean signIn;
 
-    @ApiModelProperty(value = "成单数", name = "singular")
-    private int singular;
+    @ApiModelProperty(value = "摩托车图片", name = "motorcycle")
+    private String motorcycleImg;
 
-    @ApiModelProperty(value = "距离", name = "distance")
-    private double distance;
+    @ApiModelProperty(value = "车牌照片", name = "licensePlateImg")
+    private String licensePlateImg;
 
-    @ApiModelProperty(value = "好评数", name = "goodReview")
-    private int goodReview;
-
-    @ApiModelProperty(value = "差评数", name = "badReview")
-    private int badReview;
-
-//    @ApiModelProperty(value = "操作",name = "operate")
-//    private String operate;
-
-    @ApiModelProperty(value = "摩托车及车牌照图片", name = "motorcycle")
-    private String motorcycle;
+    @ApiModelProperty(value = "驾照照片",name = "driverLicenseImg")
+    private String driverLicenseImg;
 
     @Column(nullable = false)
     @ApiModelProperty(value = "黑名单", name = "blacklist")
@@ -69,9 +55,35 @@ public class Rider extends BaseEntity {
     @Column(nullable = false)
     private Boolean enabled = true;
 
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty(value = "状态", name = "status")
+    private ApplyStatus status;
+
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
     @JoinColumn(name = "userId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     private User user;
 
+//    @ApiModelProperty(value = "准点率", name = "punctualityRate")
+//    private Double punctualityRate;
 
+//    @ApiModelProperty(value = "经验值", name = "experience")
+//    private String experience;
+
+//    @ApiModelProperty(value = "等级", name = "level")
+//    private int level;
+
+//    @ApiModelProperty(value = "成单数", name = "singular")
+//    private int singular;
+
+//    @ApiModelProperty(value = "累计距离", name = "distance")
+//    private double distance;
+
+//    @ApiModelProperty(value = "好评数", name = "goodReview")
+//    private int goodReview;
+
+//    @ApiModelProperty(value = "差评数", name = "badReview")
+//    private int badReview;
+
+//    @ApiModelProperty(value = "操作",name = "operate")
+//    private String operate;
 }

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

@@ -0,0 +1,39 @@
+package com.izouma.dingdong.domain.rider;
+
+import com.izouma.dingdong.domain.BaseEntity;
+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.Entity;
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@ApiModel(value = "RiderSign", description = "骑手签到表")
+public class RiderSign extends BaseEntity {
+
+    @ApiModelProperty(value = "骑手Id", name = "riderId")
+    private Long riderId;
+
+//    @ApiModelProperty(value = "签到", name = "signIn")
+//    private Boolean signIn;
+
+    @ApiModelProperty(value = "签到时间", name = "signTime")
+    private LocalDateTime signTime;
+
+//    @ApiModelProperty(value = "位置")
+//    private String location;
+
+    @ApiModelProperty(value = "经度", name = "longitude")
+    private Double longitude;
+
+    @ApiModelProperty(value = "纬度", name = "latitude")
+    private Double latitude;
+}

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

@@ -0,0 +1,35 @@
+package com.izouma.dingdong.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class RiderDTO {
+
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "摩托车图片", name = "motorcycle")
+    private String motorcycleImg;
+
+    @ApiModelProperty(value = "车牌照片", name = "licensePlateImg")
+    private String licensePlateImg;
+
+    @ApiModelProperty(value = "驾照照片",name = "driverLicenseImg")
+    private String driverLicenseImg;
+
+    @ApiModelProperty(value = "工作地点", name = "area")
+    private String area;
+
+    @ApiModelProperty(value = "经度", name = "longitude")
+    private Double longitude;
+
+    @ApiModelProperty(value = "纬度", name = "latitude")
+    private Double latitude;
+}

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

@@ -33,6 +33,7 @@ public class UserOrderDTO {
     private String remark;
 
 
+
 //    @ApiModelProperty(value = "商户ID", name = "merchantId")
 //    private Long merchantId;
 

src/main/java/com/izouma/dingdong/repo/rider/RiderRepo.java

@@ -11,7 +11,7 @@ public interface RiderRepo extends JpaRepository<Rider, Long>, JpaSpecificationE
 
     Optional<Rider> findByUserId(Long userId);
 
-    Optional<Rider> findByJobNumber(Long jobNumber);
+    Rider findByJobNumber(String jobNumber);
 
     //骑手Id找出用户Id
     @Query("select t.userId from Rider t where t.id = ?1")

src/main/java/com/izouma/dingdong/repo/rider/RiderSignRepo.java

@@ -0,0 +1,8 @@
+package com.izouma.dingdong.repo.rider;
+
+import com.izouma.dingdong.domain.rider.RiderSign;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface RiderSignRepo extends JpaRepository<RiderSign, Long>, JpaSpecificationExecutor<RiderSign> {
+}

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

@@ -116,9 +116,12 @@ public class OrderInfoService {
 
         //orderInfo.setUserAddress(address.getAddressName());
         orderInfo.setUserAddress(address.getAddressInfo());
+        //经度在前 纬度在后
+        orderInfo.setLocation(address.getLongitude() + "," + address.getLatitude());
 
         //重算配送费
-        BigDecimal deliveryFee = deliveryFeeService.deliveryFee(merchant.getId(), cart.getOrderGoodsSpecs(), address.getLongitude(), address.getLatitude());
+        BigDecimal deliveryFee = deliveryFeeService.deliveryFee(merchant.getId(), cart.getOrderGoodsSpecs(), address.getLongitude(), address
+                .getLatitude());
         orderInfo.setDeliveryAmount(deliveryFee);
 
         // 使用优惠券(满减优惠券)
@@ -215,46 +218,58 @@ public class OrderInfoService {
 
 
     /*
-    骑手点状态
-     */
-    public void carryOut(Long orderId, Boolean next) {
-        if (next) {
-
-            OrderInfo orderInfo = orderInfoRepo.findById(orderId).orElseThrow(new BusinessException("无订单"));
-
+    骑手改变状态
+    */
+    public void riderCarryOut(Long orderId, RiderStatus status, Double longitude, Double latitude) {
+        OrderInfo orderInfo = orderInfoRepo.findById(orderId).orElseThrow(new BusinessException("无订单"));
 
-            if (OrderStatus.CANCELLED.equals(orderInfo.getStatus())) {
-                throw new BusinessException("订单已取消");
-            }
+        if (OrderStatus.CANCELLED.equals(orderInfo.getStatus())) {
+            throw new BusinessException("订单已取消");
+        }
 
-            if (MerchantStatus.RECEIVED.equals(orderInfo.getMerchantStatus())) {
-                RiderStatus riderStatus = orderInfo.getRiderStatus();
-                switch (riderStatus) {
-                    case RECEIVED:
-                        orderInfo.setRiderStatus(RiderStatus.ARRIVE);
-                        break;
-                    case ARRIVE:
-                        orderInfo.setRiderStatus(RiderStatus.TAKE_MEAL);
-                        break;
-                    case TAKE_MEAL:
-                        orderInfo.setRiderStatus(RiderStatus.CARRY_OUT);
-                        orderInfo.setUserReceivedTime(LocalDateTime.now());
-                        orderInfo.setStatus(OrderStatus.RATED);
-
-                        //支付价钱
-                        orderRefundApplyService.orderCarryOut(orderId);
-                        //添加销量数据
-                        salesService.addSale(orderInfo);
-                        break;
+        //RiderStatus riderStatus = orderInfo.getRiderStatus();
+        switch (status) {
+            //已接单状态 待取餐
+            case ARRIVE:
+                //判断是否到达商家位置
+                Merchant merchant = orderInfo.getMerchant();
+                Double latitude1 = merchant.getLatitude();
+                Double longitude1 = merchant.getLongitude();
+                if (MapUtils.distance(longitude, latitude, longitude1, latitude1) > 5.0) {
+                    throw new BusinessException("未到店");
                 }
-                orderInfoRepo.save(orderInfo);
-            } else {
-                throw new BusinessException("出错");
-            }
+                //待取餐
+                orderInfo.setRiderStatus(RiderStatus.ARRIVE);
+                break;
+            case TAKE_MEAL:
+                //已取餐 待送达
+                orderInfo.setRiderStatus(RiderStatus.TAKE_MEAL);
+                //商家状态已完成
+                orderInfo.setMerchantStatus(MerchantStatus.CARRY_OUT);
+                break;
+            case CARRY_OUT:
+                //确认是否到达用户地址位置
+                Address address = addressRepo.findById(orderInfo.getAddressId())
+                        .orElseThrow(new BusinessException("地址不存在"));
+                Double latitude2 = address.getLatitude();
+                Double longitude2 = address.getLongitude();
+                if (MapUtils.distance(longitude, latitude, longitude2, latitude2) > 5) {
+                    throw new BusinessException("未到用户地点");
+                }
+                //已送达
+                orderInfo.setRiderStatus(RiderStatus.CARRY_OUT);
+                orderInfo.setUserReceivedTime(LocalDateTime.now());
+                orderInfo.setStatus(OrderStatus.RATED);
+
+                //支付价钱
+                orderRefundApplyService.orderCarryOut(orderId);
+                //添加销量数据
+                salesService.addSale(orderInfo);
+                break;
         }
+        orderInfoRepo.save(orderInfo);
     }
 
-
     /**
      * 按用户ID查出用户/商家/骑手订单
      *

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

@@ -50,7 +50,9 @@ public class UserService {
     public User register(String phone, String password, Identity identity) {
         User user = userRepo.findByPhoneAndIdentity(phone, identity);
         if (ObjectUtil.isNull(user)) {
-            user = User.builder().username(phone)
+            user = User.builder()
+                    .username(phone)
+                    .nickname(UUID.randomUUID().toString())
                     .blacklist(false)
                     .enabled(true)
                     .phone(phone)

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

@@ -48,7 +48,7 @@ public class BlackListService {
                 Rider rider = riderRepo.findByUserId(userId).orElseThrow(new BusinessException("骑手不存在"));
                 rider.setBlacklist(true);
                 riderRepo.save(rider);
-                build.setOtherId(rider.getJobNumber());
+                build.setOtherId(rider.getId());
                 break;
             case USER:
                 user.setBlacklist(true);
@@ -104,7 +104,7 @@ public class BlackListService {
                 break;
 
             case RIDER:
-                Rider rider = riderRepo.findByJobNumber(blackList.getOtherId())
+                Rider rider = riderRepo.findById(blackList.getOtherId())
                         .orElseThrow(new BusinessException("无骑手"));
                 rider.setBlacklist(false);
                 riderRepo.save(rider);

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

@@ -63,7 +63,6 @@ public class MerchantService {
         // User user = userService.register(merchantDTO.getPhone(), merchantDTO.getPassword());
         User user = userRepo.findByPhone(merchantDTO.getPhone());
 
-
         //查看商家是否已存在
         Merchant merchant1 = merchantRepo.findByPhone(merchantDTO.getPhone());
 
@@ -415,8 +414,14 @@ public class MerchantService {
         merchantSettingsRepo.save(merchant);
     }
 
-    /*
-    距离排序,如果有范围，范围内进行排序
+    /**
+     * 距离排序,如果有范围，范围内进行排序
+     *
+     * @param merchants 商家列表
+     * @param longitude 经度
+     * @param latitude  纬度
+     * @param range     范围
+     * @return 商家及距离
      */
     public Map<Merchant, Double> distanceSorting(Set<Merchant> merchants, Double longitude, Double latitude, Double range) {
         //所有商家要按距离排序规则
@@ -449,7 +454,15 @@ public class MerchantService {
         return merchantMap;
     }
 
-    //带距离的商家
+    /**
+     * 带距离的商家
+     *
+     * @param merchants 商户列表
+     * @param longitude 经度
+     * @param latitude  纬度
+     * @param range     范围
+     * @return 商家列表
+     */
     public List<MerchantDTO> withDistance(Set<Merchant> merchants, Double longitude, Double latitude, Double range) {
         Map<Merchant, Double> merchantMap = this.distanceSorting(merchants, longitude, latitude, range);
         List<MerchantDTO> dtos = new ArrayList<>();

src/main/java/com/izouma/dingdong/service/rider/DeliveryFeeService.java

@@ -25,7 +25,15 @@ public class DeliveryFeeService {
     private OrderInfoRepo   orderInfoRepo;
     private MerchantRepo    merchantRepo;
 
-    //配送费用
+    /**
+     * 配送费用
+     *
+     * @param merchantId      商户ID
+     * @param orderGoodsSpecs 订单商品及规格
+     * @param longitude       经度
+     * @param latitude        纬度
+     * @return 配送费
+     */
     public BigDecimal deliveryFee(Long merchantId, List<OrderGoodsSpec> orderGoodsSpecs, Double longitude, Double latitude) {
 
         //基础费用

src/main/java/com/izouma/dingdong/service/rider/RiderService.java

@@ -1,12 +1,16 @@
 package com.izouma.dingdong.service.rider;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.izouma.dingdong.domain.MoneyRecord;
 import com.izouma.dingdong.domain.OrderInfo;
+import com.izouma.dingdong.domain.OrderRefundApply;
 import com.izouma.dingdong.domain.User;
 import com.izouma.dingdong.domain.merchant.Merchant;
 import com.izouma.dingdong.domain.rider.Rider;
-import com.izouma.dingdong.domain.user.Address;
+import com.izouma.dingdong.domain.rider.RiderSign;
+import com.izouma.dingdong.dto.RiderDTO;
 import com.izouma.dingdong.dto.RiderDistanceDTO;
 import com.izouma.dingdong.enums.*;
 import com.izouma.dingdong.exception.BusinessException;
@@ -14,12 +18,12 @@ import com.izouma.dingdong.repo.MoneyRecordRepo;
 import com.izouma.dingdong.repo.OrderInfoRepo;
 import com.izouma.dingdong.repo.UserRepo;
 import com.izouma.dingdong.repo.rider.RiderRepo;
-import com.izouma.dingdong.repo.user.AddressRepo;
-import com.izouma.dingdong.service.OrderInfoService;
+import com.izouma.dingdong.repo.rider.RiderSignRepo;
 import com.izouma.dingdong.service.OrderRefundApplyService;
-import com.izouma.dingdong.service.merchant.SalesService;
 import com.izouma.dingdong.utils.MapUtils;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -35,19 +39,79 @@ public class RiderService {
     private MoneyRecordRepo         moneyRecordRepo;
     private OrderInfoRepo           orderInfoRepo;
     private OrderRefundApplyService orderRefundApplyService;
-    private SalesService            salesService;
-    private AddressRepo             addressRepo;
-//    private OrderInfoService        orderInfoService;
+    private RiderSignRepo           riderSignRepo;
+
 
     /*
-    骑手签到
+    骑手注册
      */
-    public void sign(Long riderId) {
+    public Rider riderApply(RiderDTO riderDTO) {
+        userRepo.findById(riderDTO.getUserId()).orElseThrow(new BusinessException("无用户"));
+        Rider rider = new Rider();
+        BeanUtil.copyProperties(rider, riderDTO);
+        rider.setBlacklist(false);
+        rider.setEnabled(true);
+        //rider.setSignIn(false);
+        rider.setStatus(ApplyStatus.PENDING);
+        return riderRepo.save(rider);
+    }
 
+    /*
+    骑手审核
+     */
+    public void riderAudit(Long riderId, Boolean pass) {
+        Rider rider = riderRepo.findById(riderId).orElseThrow(new BusinessException("无骑手"));
+        if (pass) {
+            rider.setStatus(ApplyStatus.PASS);
+            boolean i = true;
+            while (i) {
+                //随机生成骑手工号 一个首字母+四个数字
+                String jobNumber1 = RandomStringUtils.randomAlphabetic(1);
+                String jobNumber2 = RandomStringUtils.randomNumeric(4);
+                String jobNumber = jobNumber1 + jobNumber2;
+                Rider byJobNumber = riderRepo.findByJobNumber(jobNumber);
+                if (ObjectUtil.isNull(byJobNumber)) {
+                    rider.setJobNumber(jobNumber);
+                    i = false;
+                }
+            }
+        } else {
+            rider.setStatus(ApplyStatus.DENY);
+        }
+        riderRepo.save(rider);
     }
 
+
     /*
-    骑手收入，且保存到记录表
+    骑手签到
+     */
+    public void sign(Long riderId, String password, Double longitude, Double latitude) {
+        Rider rider = riderRepo.findById(riderId).orElseThrow(new BusinessException("无骑手"));
+        Double distance = MapUtils.distance(longitude, latitude, rider.getLongitude(), rider.getLatitude());
+        if (distance > 3000) {
+            throw new BusinessException("不在工作区域");
+        }
+        User user = userRepo.findById(rider.getUserId()).orElseThrow(new BusinessException("无用户"));
+        boolean matches = new BCryptPasswordEncoder().matches(password, user.getPassword());
+        if (!matches) {
+            throw new BusinessException("密码不正确");
+        }
+        riderSignRepo.save(RiderSign.builder()
+                .latitude(latitude)
+                .longitude(longitude)
+                .riderId(riderId)
+                .signTime(LocalDateTime.now())
+                .build());
+    }
+
+    /**
+     * 骑手收入，且保存到记录表
+     *
+     * @param riderId    骑手ID
+     * @param fromUserId 来自用户
+     * @param amount     金额
+     * @param type       流水类型
+     * @param remark     备注
      */
     public void income(Long riderId, Long fromUserId, BigDecimal amount, FinancialType type, String remark) {
         //骑手应得  riderRepo.findUserIdById(riderId)
@@ -69,7 +133,6 @@ public class RiderService {
                 .remark(remark)
                 .enabled(true)
                 .build());
-
     }
 
 
@@ -123,6 +186,8 @@ public class RiderService {
         //无骑手，取消订单
         if (CollUtil.isEmpty(map)) {
 //            orderInfoService.cancel(orderId, RefundReason.UNABLE_TO_DELIVER, null, null);
+            OrderRefundApply apply = orderRefundApplyService.apply(orderId, RefundReason.UNABLE_TO_DELIVER, null, null);
+            orderRefundApplyService.audit(apply.getId(), true, false);
             return;
         }
 
@@ -132,18 +197,18 @@ public class RiderService {
 
         for (Map.Entry<Long, Double> m : list) {
             Rider rider = riderRepo.findById(m.getKey()).orElseThrow(new BusinessException("无骑手"));
-            if (rider.getSignIn()) {
-                List<OrderInfo> infos = orderInfoRepo.findAllByRiderIdAndRiderStatusIsNot(m.getKey(), RiderStatus.CARRY_OUT);
-                //有空闲骑手，自动接单，不可拒单
-                if (CollUtil.isEmpty(infos)) {
-                    //riderId = m.getKey();
-                    orderInfo.setRiderId(m.getKey());
-                    orderInfo.setRiderStatus(RiderStatus.RECEIVED);
-                    orderInfoRepo.save(orderInfo);
-                    return;
-                    //break;
-                }
+            //if (rider.getSignIn()) {
+            List<OrderInfo> infos = orderInfoRepo.findAllByRiderIdAndRiderStatusIsNot(m.getKey(), RiderStatus.CARRY_OUT);
+            //有空闲骑手，自动接单，不可拒单
+            if (CollUtil.isEmpty(infos)) {
+                //riderId = m.getKey();
+                orderInfo.setRiderId(m.getKey());
+                orderInfo.setRiderStatus(RiderStatus.RECEIVED);
+                orderInfoRepo.save(orderInfo);
+                return;
+                //break;
             }
+            //}
         }
 
         //无空闲骑手，未完成订单最少的接单
@@ -179,57 +244,4 @@ public class RiderService {
     }
 
 
-   /*
-   骑手改变状态
-   */
-
-    public void riderCarryOut(Long orderId, RiderStatus status, Double longitude, Double latitude) {
-        OrderInfo orderInfo = orderInfoRepo.findById(orderId).orElseThrow(new BusinessException("无订单"));
-
-        if (OrderStatus.CANCELLED.equals(orderInfo.getStatus())) {
-            throw new BusinessException("订单已取消");
-        }
-
-        //RiderStatus riderStatus = orderInfo.getRiderStatus();
-        switch (status) {
-            //已接单状态 待取餐
-            case ARRIVE:
-                //判断是否到达商家位置
-                Merchant merchant = orderInfo.getMerchant();
-                Double latitude1 = merchant.getLatitude();
-                Double longitude1 = merchant.getLongitude();
-                if (MapUtils.distance(longitude, latitude, longitude1, latitude1) > 5.0) {
-                    throw new BusinessException("未到店");
-                }
-                //待取餐
-                orderInfo.setRiderStatus(RiderStatus.ARRIVE);
-                break;
-            case TAKE_MEAL:
-                //已取餐 待送达
-                orderInfo.setRiderStatus(RiderStatus.TAKE_MEAL);
-                //商家状态已完成
-                orderInfo.setMerchantStatus(MerchantStatus.CARRY_OUT);
-                break;
-            case CARRY_OUT:
-                //确认是否到达用户地址位置
-                Address address = addressRepo.findById(orderInfo.getAddressId())
-                        .orElseThrow(new BusinessException("地址不存在"));
-                Double latitude2 = address.getLatitude();
-                Double longitude2 = address.getLongitude();
-                if (MapUtils.distance(longitude, latitude, longitude2, latitude2) > 5) {
-                    throw new BusinessException("未到用户地点");
-                }
-                //已送达
-                orderInfo.setRiderStatus(RiderStatus.CARRY_OUT);
-                orderInfo.setUserReceivedTime(LocalDateTime.now());
-                orderInfo.setStatus(OrderStatus.RATED);
-
-                //支付价钱
-                orderRefundApplyService.orderCarryOut(orderId);
-                //添加销量数据
-                salesService.addSale(orderInfo);
-                break;
-        }
-        orderInfoRepo.save(orderInfo);
-    }
 }

src/main/java/com/izouma/dingdong/service/rider/RiderSignService.java

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.service.rider;
+
+import com.izouma.dingdong.domain.rider.RiderSign;
+import com.izouma.dingdong.repo.rider.RiderSignRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class RiderSignService {
+
+    private RiderSignRepo riderSignRepo;
+
+}

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

@@ -106,9 +106,9 @@ public class AuthenticationController {
 
     @PostMapping("/loginByRegister")
     @ApiOperation("注册登录")
-    public String loginByRegister(String phone, String password) {
+    public String loginByRegister(String phone, String password,Identity identity) {
         try {
-            User user = userService.register(phone, password, Identity.USER);
+            User user = userService.register(phone, password, identity);
             return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
         } catch (Exception e) {
             log.error("loginByRegister", e);

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

@@ -124,7 +124,7 @@ public class OrderInfoController extends BaseController {
     @PostMapping("/riderStatus")
     @ApiOperation("骑手改变状态")
     public void riderStatus(Long orderId, Boolean pass) {
-        orderInfoService.carryOut(orderId, pass);
+//        orderInfoService.riderCarryOut(orderId, pass);
     }
 
     @GetMapping("/allAmount")

src/main/java/com/izouma/dingdong/web/rider/RiderSignController.java

@@ -0,0 +1,63 @@
+package com.izouma.dingdong.web.rider;
+
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.rider.RiderSign;
+import com.izouma.dingdong.service.rider.RiderSignService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.rider.RiderSignRepo;
+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("/riderSign")
+@AllArgsConstructor
+public class RiderSignController extends BaseController {
+    private RiderSignService riderSignService;
+    private RiderSignRepo riderSignRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public RiderSign save(@RequestBody RiderSign record) {
+        if (record.getId() != null) {
+            RiderSign orig = riderSignRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return riderSignRepo.save(orig);
+        }
+        return riderSignRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<RiderSign> all(PageQuery pageQuery) {
+        return riderSignRepo.findAll(toSpecification(pageQuery,RiderSign.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public RiderSign get(@PathVariable Long id) {
+        return riderSignRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        riderSignRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<RiderSign> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/RiderSign.json

@@ -0,0 +1 @@
+{"tableName":"RiderSign","className":"RiderSign","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":"riderId","modelName":"riderId","remark":"骑手Id","showInList":true,"showInForm":true,"formType":"number"},{"name":"signTime","modelName":"signTime","remark":"签到时间","showInList":true,"showInForm":true,"formType":"datetime"},{"name":"longitude","modelName":"longitude","remark":"经度","showInList":true,"showInForm":true,"formType":"number"},{"name":"latitude","modelName":"latitude","remark":"纬度","showInList":true,"showInForm":true,"formType":"number"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.dingdong","tablePackage":"com.izouma.dingdong.domain.rider.RiderSign","genPackage":"rider"}

src/main/vue/src/router.js

@@ -430,6 +430,22 @@ const router = new Router({
                     meta: {
                        title: '配送管理',
                     },
+               },
+                {
+                    path: '/riderSignEdit',
+                    name: 'RiderSignEdit',
+                    component: () => import(/* webpackChunkName: "riderSignEdit" */ '@/views/rider/RiderSignEdit.vue'),
+                    meta: {
+                       title: '骑手签到编辑',
+                    },
+                },
+                {
+                    path: '/riderSignList',
+                    name: 'RiderSignList',
+                    component: () => import(/* webpackChunkName: "riderSignList" */ '@/views/rider/RiderSignList.vue'),
+                    meta: {
+                       title: '骑手签到',
+                    },
                }
                 /**INSERT_LOCATION**/,
                 {

src/main/vue/src/views/merchant/GoodsList.vue

@@ -98,13 +98,15 @@
                     label="操作"
                     align="center"
                     fixed="right"
-                    min-width="350">
+                    min-width="150">
                 <template slot-scope="{row}">
                     <!-- <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>-->
                     <el-button @click="take(row)" type="warning" size="mini" plain v-if="row.status === 'PASS'">
                         {{row.takeOff?'上架':'下架'}}
                     </el-button>
-                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                    <el-button @click="deleteRow(row)" type="info" size="mini" plain v-if="row.status !== 'PENDING'">
+                        删除
+                    </el-button>
                     <el-button
                             v-if="row.status === 'PENDING'"
                             :loading="row.loading"

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

@@ -116,14 +116,14 @@
             </el-table-column>-->
             <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="showDrawer(row)" type="success" 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"
                             @click="audit(row, true)"
-                            type="primary"
+                            type="warning"
                             size="mini"
                             plain
                     >通过

src/main/vue/src/views/rider/RiderSignEdit.vue

@@ -0,0 +1,102 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                <el-form-item prop="riderId" label="骑手Id">
+                            <el-input-number type="number" v-model="formData.riderId"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="signTime" label="签到时间">
+                            <el-date-picker
+                                    v-model="formData.signTime"
+                                    type="datetime"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
+                                    placeholder="选择日期时间">
+                            </el-date-picker>
+                </el-form-item>
+                <el-form-item prop="longitude" label="经度">
+                            <el-input-number type="number" v-model="formData.longitude"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="latitude" label="纬度">
+                            <el-input-number type="number" v-model="formData.latitude"></el-input-number>
+                </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: 'RiderSignEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('riderSign/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('/riderSign/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(`/riderSign/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/rider/RiderSignList.vue

@@ -0,0 +1,171 @@
+<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="riderId" label="骑手Id"
+>
+                    </el-table-column>
+                    <el-table-column prop="signTime" label="签到时间"
+                            :formatter="datetimeFormatter"
+>
+                    </el-table-column>
+                    <el-table-column prop="longitude" label="经度"
+>
+                    </el-table-column>
+                    <el-table-column prop="latitude" 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: 'RiderSignList',
+        mixins: [pageableTable],
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/riderSign/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: "/riderSignEdit",
+                    query: {
+                    ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/riderSignEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/riderSign/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(`/riderSign/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/service/RiderServiceTest.java

@@ -0,0 +1,23 @@
+package com.izouma.dingdong.service;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class RiderServiceTest {
+
+    @Test
+    public void test(){
+
+        String encode = new BCryptPasswordEncoder().encode("123456");
+        String str = "123456";
+        System.out.println(new BCryptPasswordEncoder().matches(str,encode));
+//        System.out.println(RandomStringUtils.randomAlphabetic(1));
+//        System.out.println(RandomStringUtils.randomNumeric(4));
+    }
+}