Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

puzhibing

1 天以前 ad4cc050c77b41637d1ac445c7dc6922c3e63624

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

# Conflicts:
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java

@@ -91,7 +91,7 @@
    @ApiOperation(value = "门店详情预约操作【2.0】")
    public R appointmentTime(@RequestBody AppointmentTimeDto dto) {
        TShopAppointableTime one = shopAppointableTimeService.getOne(new LambdaQueryWrapper<TShopAppointableTime>().eq(TShopAppointableTime::getShopId, dto.getShopId())
                .last(" and DATE_FORMAT(appointable_time, '%Y-%m-%d %H:%i') = '" + dto.getTime() + "'"));
                .last(" and DATE_FORMAT(appointment_time, '%Y-%m-%d %H:%i') = '" + dto.getTime() + "'"));
        if (null != one) {
            return R.fail("不能重复预约");
        }

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopAppointableTimeMapper.xml

@@ -7,7 +7,7 @@
        select * from (
            select
            a.id,
            DATE_FORMAT(a.appointable_time,  '%Y-%m-%d %H:%i') as appointmentTime,
            DATE_FORMAT(a.appointment_time,  '%Y-%m-%d %H:%i') as appointmentTime,
            a.status,
            b.shop_name as shopName,
            a.reason as cancelReason,
@@ -33,7 +33,7 @@
           <if test="null != item.status">
               and a.status = #{item.status}
           </if>
        ) as aa order by aa.sort,aa.appointable_time
        ) as aa order by aa.sort,aa.appointment_time
    </select>