Skip to content

G
gogirl-miniapp-backend
Commit f24e91b7 by huluobin
Options

Merge branch '3.8' into 3.9 

# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
#	src/main/java/com/gogirl/infrastructure/mapper/market/discount/LeisureDiscountConfigLimitMapper.java
#	src/main/resources/mapper/LeisureDiscountConfigLimitMapper.xml
parents 4e82f2ee dc26aa0e
Showing with 198 additions and 151 deletions
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
......@@ -178,7 +178,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
.payPrice(baseServe.getPrice())
.isOwnProduce(baseServe.getIsOwnProduce())
.achievement(baseServe.getPrice());
// .leisureDiscountPrice(BigDecimal.ZERO);
//款式信息
if (orderServeParam.getProduceId() != null) {
......@@ -250,10 +250,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
}
orderServe.setOwnProduce(ownProduceMapper.selectById(orderServe.getOwnProduceId()));
}
// else {
// orderServe.setIsOwnProduce(2);
// orderServe.setOwnProduceId(null);
// }
orderServe.calcPriceAndTimeLength();
orderServeMapper.insert(orderServe);
......@@ -265,6 +261,15 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
OrderServe orderServe = orderServeMapper.selectById(orderServeParam.getId());
//如果修改的订单服务 闲时折扣作废
if (!orderServe.getServeId().equals(orderServeParam.getServeId())) {
//设置折扣属性
orderServe.setLeisureDiscountConfigId(null);
orderServe.setDiscountRate(null);
orderServe.setLeisurePrice(null);
}
//服务改价
orderServe.setServeChangePrice(orderServeParam.getServeChangePrice());
//服务id
......@@ -348,9 +353,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderServe.setServeChangePrice(orderServeParam.getServeChangePrice());
}
List<StoreTechnician> storeTechnicianList = storeTechnicianMapper.selectList(
new LambdaQueryWrapper<StoreTechnician>().in(StoreTechnician::getId, Lists.newArrayList(orderServeParam.getTechnicianId().split(",")))
);
List<StoreTechnician> storeTechnicianList = storeTechnicianMapper.selectList(new LambdaQueryWrapper<StoreTechnician>().in(StoreTechnician::getId, Lists.newArrayList(orderServeParam.getTechnicianId().split(","))));
//美甲师id
orderServe.setTechnicianId(orderServeParam.getTechnicianId());
//美甲师姓名
......@@ -369,6 +372,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderServe.setOwnProduce(ownProduceMapper.selectById(orderServe.getOwnProduceId()));
}
orderServe.calcPriceAndTimeLength();
orderServeMapper.updateById(orderServe);
}
......
src/main/java/com/gogirl/application/product/serve/impl/BaseServeServiceImpl.java
package com.gogirl.application.product.serve.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gogirl.application.product.serve.BaseServeService;
import com.gogirl.domain.market.discount.LeisureDiscountConfig;
import com.gogirl.domain.product.serve.BaseProduce;
import com.gogirl.domain.product.serve.BaseServe;
import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigMapper;
import com.gogirl.infrastructure.mapper.product.serve.BaseProduceMapper;
import com.gogirl.infrastructure.mapper.product.serve.BaseServeMapper;
import com.gogirl.infrastructure.util.SessionUtils;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
......@@ -20,6 +23,7 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
private final BaseServeMapper baseServeMapper;
private final LeisureDiscountConfigMapper leisureDiscountConfigMapper;
private final BaseProduceMapper baseProduceMapper;
@Override
......@@ -30,15 +34,12 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
@Override
public BaseServe getAggregate(Integer id, LocalDateTime date, Integer departmentId) {
BaseServe baseServe = baseServeMapper.selectById(id);
if (date != null) {
LeisureDiscountConfig leisureDiscountConfig = leisureDiscountConfigMapper.selectLeisureDiscount(id,
date.toLocalTime().toString(),
date.getDayOfWeek().getValue(),
departmentId);
if (leisureDiscountConfig != null)
baseServe.setDiscountRate(leisureDiscountConfig.getDiscountRate());
BaseServe baseServe = baseServeMapper.selectById(id);
if (SessionUtils.getSourceFrom().equals(SessionUtils.technician)) {
List<BaseProduce> baseProduceList = baseProduceMapper.selectList(new LambdaQueryWrapper<BaseProduce>().eq(BaseProduce::getServiceId, id));
baseServe.setListProduce(baseProduceList);
}
return baseServe;
}
......
src/main/java/com/gogirl/application/store/store/impl/CareerCmdServiceImpl.java
......@@ -211,4 +211,5 @@ public class CareerCmdServiceImpl implements CareerCmdService {
return baseProducePage;
}
}
src/main/java/com/gogirl/application/store/store/impl/StoreTechnicianServiceImpl.java
......@@ -111,6 +111,7 @@ public class StoreTechnicianServiceImpl extends ServiceImpl<StoreTechnicianMappe
if (storeTechnician.getDepartmentId() != null) {
wrapper.eq(StoreTechnician::getDepartmentId, storeTechnician.getDepartmentId());
}
wrapper.eq(StoreTechnician::getIsAdmin, false);
return this.list(wrapper);
}
}
src/main/java/com/gogirl/domain/market/discount/LeisureDiscountConfig.java
......@@ -44,5 +44,5 @@ public class LeisureDiscountConfig implements Serializable {
@TableField("`limit`")
private Integer limit;
private Integer leftTimes;
}
src/main/java/com/gogirl/domain/market/discount/LeisureDiscountConfigLimit.java
package com.gogirl.domain.market.discount;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -20,17 +23,21 @@ import java.time.LocalDateTime;
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="LeisureDiscountConfigLimit对象", description="")
@ApiModel(value = "LeisureDiscountConfigLimit对象", description = "")
public class LeisureDiscountConfigLimit implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value = "日期")
private LocalDateTime date;
@ApiModelProperty(value = "闲时折扣id")
private Integer leisureDiscountConfigId;
@TableField("`limit`")
@ApiModelProperty(value = "限制数量")
private Integer limit;
......
src/main/java/com/gogirl/domain/order/serve/OrderServe.java
......@@ -81,14 +81,19 @@ public class OrderServe implements Serializable {
*/
@ApiModelProperty("服务数量")
private Integer serveNumber;
@ApiModelProperty("预约服务id")
private Integer serveId;
@ApiModelProperty("服务名称")
private String serveName;
@ApiModelProperty("图片名称")
private String servePicturePath;
@ApiModelProperty("服务价格")
private BigDecimal servePrice;
@ApiModelProperty("服务分类")
private String serveType;
......@@ -148,6 +153,7 @@ public class OrderServe implements Serializable {
private Integer removeCouponId;
@TableField(strategy = FieldStrategy.IGNORED)
@ApiModelProperty("闲时折扣配置id")
private Integer leisureDiscountConfigId;
......@@ -237,9 +243,11 @@ public class OrderServe implements Serializable {
@TableField(strategy = FieldStrategy.IGNORED)
private Integer producePromotionTimeId;
@TableField(strategy = FieldStrategy.IGNORED)
@ApiModelProperty("折扣")
private BigDecimal discountRate;
@TableField(strategy = FieldStrategy.IGNORED)
@ApiModelProperty("闲时价格")
private BigDecimal leisurePrice;
......
src/main/java/com/gogirl/domain/order/serve/ScheduleManage.java
......@@ -175,10 +175,6 @@ public class ScheduleManage implements Serializable {
@ApiModelProperty("预约用户信息")
private Customer customer;
public void setRemark(String remark) {
this.remark = this.remark + "," + remark;
}
public void addScheduleServeList(Collection<ScheduleServe> scheduleServes) {
listScheduleServer.addAll(scheduleServes);
}
......
src/main/java/com/gogirl/domain/order/serve/ScheduleServe.java
......@@ -82,6 +82,7 @@ public class ScheduleServe implements Serializable {
* 款式
*/
@TableField(strategy = FieldStrategy.IGNORED)
private BigDecimal discountRate;
......@@ -132,6 +133,7 @@ public class ScheduleServe implements Serializable {
@ApiModelProperty("售后说明")
private String explain;
@TableField(strategy = FieldStrategy.IGNORED)
private Integer leisureDiscountConfigId;
......@@ -185,6 +187,7 @@ public class ScheduleServe implements Serializable {
private Integer producePromotionTimeId;
@TableField(strategy = FieldStrategy.IGNORED)
private BigDecimal leisurePrice;
@ApiModelProperty("是否自带款式 1-是 2-否")
......
src/main/java/com/gogirl/domain/store/store/StoreTechnician.java
......@@ -121,5 +121,6 @@ public class StoreTechnician implements Serializable {
@TableField(exist = false)
private StoreTechnicianDTO applyStoreTechnicianDTO;
@ApiModelProperty("是否管理员")
private Boolean isAdmin;
}
src/main/java/com/gogirl/infrastructure/mapper/market/discount/LeisureDiscountConfigLimitMapper.java
......@@ -3,6 +3,10 @@ package com.gogirl.infrastructure.mapper.market.discount;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gogirl.domain.market.discount.LeisureDiscountConfigLimit;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDate;
import java.time.LocalTime;
/**
* <p>
......@@ -22,5 +26,12 @@ public interface LeisureDiscountConfigLimitMapper extends BaseMapper<LeisureDisc
* @param leisureDiscountConfigId
* @return
*/
LeisureDiscountConfigLimit selectConfigLimit(@Param("date") String date, @Param("leisureDiscountConfigId") Integer leisureDiscountConfigId);
LeisureDiscountConfigLimit selectConfigLimit(String date, Integer leisureDiscountConfigId);
LeisureDiscountConfigLimit selectOneLeisureDiscountConfig(@Param("leisureDiscountConfigId") Integer leisureDiscountConfigId,
@Param("serveId") Integer serveId,
@Param("time") LocalTime time,
@Param("date") LocalDate date);
}
src/main/java/com/gogirl/infrastructure/mapper/market/discount/LeisureDiscountConfigMapper.java
......@@ -2,71 +2,17 @@ package com.gogirl.infrastructure.mapper.market.discount;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gogirl.domain.market.discount.LeisureDiscountConfig;
import com.gogirl.domain.product.serve.BaseServe;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface LeisureDiscountConfigMapper extends BaseMapper<LeisureDiscountConfig> {
/**
* 获取店铺对应星期数的打折服务列表
*
* @param departmentId 店铺id
* @param week 周几
* @return 服务列表
*/
List<BaseServe> selectByDepartmentId(@Param("departmentId") Integer departmentId, @Param("week") int week);
/**
* 获取折扣最低的闲时折扣
*
* @return discount
*/
LeisureDiscountConfig queryMinDiscount();
/**
* 获取时间，服务，周几对应的折扣
*
* @param time 时间形如'10:00'
* @param serviceId 服务id
* @param weekday 周几
* @return 折扣列表
*/
LeisureDiscountConfig selectLeisureDiscount(@Param("serviceId") Integer serviceId,
@Param("time") String time,
@Param("weekday") int weekday,
@Param("departmentId") int departmentId);
/**
* 获取店铺id，星期数，时间段形如'10:00'对应的折扣列表 忽略剩余次数条件
*
* @param departmentId 店铺Id
* @param finalWeekday 星期几
* @param time 时间形如
* @return list
*/
List<BaseServe> selectByDepartmentIdAndWeekAndDateTime(@Param("departmentId") Integer departmentId, @Param("week") int finalWeekday, @Param("time") String time);
/**
* 获取店铺id，星期数对应的折扣列表 忽略剩余次数条件
*
* @param departmentId 店铺Id
* @param weekday 星期几
* @return list
*/
List<LeisureDiscountConfig> selectByDepartmentIdAndWeekIgnoreLimit(@Param("departmentId") Integer departmentId, @Param("week") int weekday);
/**
* 获取时间，服务，周几对应的折扣列表
*
* @param time 时间形如'10:00'
* @param serveId 服务id
* @param weekday 周几
* @return 折扣列表
*/
List<LeisureDiscountConfig> selectIsLeisureTime(@Param("time") String time, @Param("serveId") Integer serveId, @Param("week") int weekday);
}
src/main/java/com/gogirl/infrastructure/schedule/Schedule.java
......@@ -29,6 +29,7 @@ import com.gogirl.infrastructure.common.util.JsonUtilByJackson;
import com.gogirl.infrastructure.common.util.ListUtil;
import com.gogirl.infrastructure.config.property.GogirlProperties;
import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper;
import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigLimitMapper;
import com.gogirl.infrastructure.mapper.market.timescard.TimesCardCustomerRelevanceMapper;
import com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper;
import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
......@@ -122,6 +123,7 @@ public class Schedule {
private final GogirlProperties gogirlProperties;
private final TechnicianPushService technicianPushService;
private final LeisureDiscountConfigLimitMapper leisureDiscountConfigLimitMapper;
private final TimesCardCustomerRelevanceMapper timesCardCustomerRelevanceMapper;
private final RestTemplate restTemplate;
......@@ -384,6 +386,16 @@ public class Schedule {
localDate = localDate.plusDays(1);
}
log.debug("同步闲时折扣周 结束");
log.debug("同步最新闲时间折扣限制开始");
try {
leisureDiscountConfigLimitMapper.syncWeekConfigLimit();
} catch (Exception e) {
log.error("同步最新闲时间折扣限制失败");
}
log.debug("同步最新闲时间折扣限制结束");
}
/**
......
src/main/java/com/gogirl/interfaces/order/serve/ScheduleManageController.java
......@@ -68,7 +68,6 @@ public class ScheduleManageController {
}
@ApiOperation("提交预约")
@PostMapping("/customer/schedule/submitSchedule")
public JsonResult<Void> submitSchedule(@RequestBody SubmitScheduleCommand cmd) throws ParseException, ExecutionException, InterruptedException {
......@@ -208,11 +207,11 @@ public class ScheduleManageController {
public JsonResult<Void> updateSchedule(@RequestBody SubmitScheduleCommand cmd) throws ParseException, ExecutionException, InterruptedException {
ScheduledLock scheduledLock = ScheduledLock.getInstance();
if (cmd.getScheduleManageDTO().getId() == null) {
throw new InvalidParameterException();
}
try {
log.info("店员更新预约:{}", cmd);
if (cmd.getScheduleManageDTO().getId() == null) {
throw new InvalidParameterException();
}
scheduledLock.lock(cmd.getScheduleManageDTO().getId());
cmd.getScheduleManageDTO().setDepartmentId(SessionUtils.getTechnicianToken().getDepartmentId());
......@@ -225,6 +224,7 @@ public class ScheduleManageController {
return JsonResult.success();
}
@Deprecated
@ApiOperation("更新前检查预约")
@PostMapping("/technician/schedule/checkBeforeUpdate")
public JsonResult<Void> checkBeforeUpdate(@RequestBody UpdateScheduleCommand cmd) {
......@@ -232,6 +232,12 @@ public class ScheduleManageController {
}
/**
* @param scheduleServeId
* @param status
* @param forceLeisureConfig 强制使用闲时预约次数 1-是 2-否
* @return
*/
@ApiOperation("更新预约服务状态")
@GetMapping("/technician/schedule/updateScheduledServeStatus")
public JsonResult<Void> updateScheduledServeStatus(@RequestParam Integer scheduleServeId,
......@@ -253,7 +259,7 @@ public class ScheduleManageController {
}
@ApiOperation("当前服务是否在闲时间范围内 1-是 2-否")
@ApiOperation("当前服务是否在闲时间范围内 1-是 2-否 3-不存在")
@GetMapping("/technician/schedule/getScheduledServeLeisure")
public JsonResult<Integer> getScheduledServeLeisure(@RequestParam Integer scheduleServeId) {
Integer result = scheduleManageService.getScheduledServeLeisure(scheduleServeId);
......
src/main/resources/1_www.begogirls.com_bundle.crt 0 → 100644
-----BEGIN CERTIFICATE-----
MIIFsTCCBJmgAwIBAgIQCKySqqQm3xoNyG7XLDT9ZzANBgkqhkiG9w0BAQsFADBy
MQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywg
SW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxHTAbBgNVBAMTFFRy
dXN0QXNpYSBUTFMgUlNBIENBMB4XDTIwMDcxMTAwMDAwMFoXDTIxMDcxMjEyMDAw
MFowHDEaMBgGA1UEAxMRd3d3LmJlZ29naXJscy5jb20wggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQDQ6EiiyRBunzxXR0xqdLmEgEWT+WuuBE2c5uYh/IDO
XvawVyKNBOwA0rXVTUNB+ni37kVBG4a96Z7B15PWXG8GegdgRvLafVBYSsBzGbrb
Hn0UNLkw6cCANZMY8MJUtl60HPmhfqF0Od5NnAW7x6JhYoCIGgP8UtOJkC5/wnWf
gms2fia+DGBmTB+T5RstU9FLljeOIL3lsem7M8LWtlZ6aiMAoomVgPzGLjPZ6G3B
1z4YVPL0DzuyHcE22/bME0LgaQMUa4ANMGAnAbWuvJVPu172hKu28B1j0FIBp+u9
K2Ht7xRNVMhFM97tGga0rjSUdYNm3Z187RDNr5w46b1VAgMBAAGjggKXMIICkzAf
BgNVHSMEGDAWgBR/05nzoEcOMQBWViKOt8ye3coBijAdBgNVHQ4EFgQUjel55RKP
u7nRqpvDKbM8V7Z/MBUwKwYDVR0RBCQwIoIRd3d3LmJlZ29naXJscy5jb22CDWJl
Z29naXJscy5jb20wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
BggrBgEFBQcDAjBMBgNVHSAERTBDMDcGCWCGSAGG/WwBAjAqMCgGCCsGAQUFBwIB
FhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgGBmeBDAECATCBkgYIKwYB
BQUHAQEEgYUwgYIwNAYIKwYBBQUHMAGGKGh0dHA6Ly9zdGF0dXNlLmRpZ2l0YWxj
ZXJ0dmFsaWRhdGlvbi5jb20wSgYIKwYBBQUHMAKGPmh0dHA6Ly9jYWNlcnRzLmRp
Z2l0YWxjZXJ0dmFsaWRhdGlvbi5jb20vVHJ1c3RBc2lhVExTUlNBQ0EuY3J0MAkG
A1UdEwQCMAAwggEFBgorBgEEAdZ5AgQCBIH2BIHzAPEAdwD2XJQv0XcwIhRUGAgw
lFaO400TGTO/3wwvIAvMTvFk4wAAAXM9+QMCAAAEAwBIMEYCIQCmIw/P8OU1kSBd
VtG9thVwpFE1BwJNHS+udzV47a7joQIhALMc1Z5o+WfbELIHEhBSH4+zQTQ4WOkO
HvNvhR7tR1SZAHYAXNxDkv7mq0VEsV6a1FbmEDf71fpH3KFzlLJe5vbHDsoAAAFz
PfkDMQAABAMARzBFAiEA68SEpQRPmjUP6dwDhUKob2TJFAza1KXIPpdLJGYB9A8C
IGK+hMH4D7ZDK7iaFGXplOdBuO2k6tVgavdQMVw+SnjpMA0GCSqGSIb3DQEBCwUA
A4IBAQAKknBHtuyeoEC3mozZQVFlV4FjkYP6hUakHIM8v3x51Xc6R7YOHVn77aQQ
TlIU9sUduBv3yYYAfHXG1PxjgKS1RL7ubqbvTDfphdn+vzrSqkXFZFB4pXUXfIGs
Ft0pRJgpZZAaX4GWTNzXaQ/o1c5yWHe43BOla1R/Gvfhnxs5KRsZRS3xFZV2Ex/b
UTV/KRcDE+EOgpMvujhg2sIxqbptAw2PEUwDdKWYGz7qfuMPdomoSQLRiAL4bUMs
aiOSc/FPSoYZxlWrMD4nQU2Hp1V8rtjeGzDOb6oR0bzjjI13uASho+j0GORqCxDb
ZSz+Z5xDoGe7qnT36VuWQgYtYzts
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIErjCCA5agAwIBAgIQBYAmfwbylVM0jhwYWl7uLjANBgkqhkiG9w0BAQsFADBh
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
QTAeFw0xNzEyMDgxMjI4MjZaFw0yNzEyMDgxMjI4MjZaMHIxCzAJBgNVBAYTAkNO
MSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQL
ExREb21haW4gVmFsaWRhdGVkIFNTTDEdMBsGA1UEAxMUVHJ1c3RBc2lhIFRMUyBS
U0EgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgWa9X+ph+wAm8
Yh1Fk1MjKbQ5QwBOOKVaZR/OfCh+F6f93u7vZHGcUU/lvVGgUQnbzJhR1UV2epJa
e+m7cxnXIKdD0/VS9btAgwJszGFvwoqXeaCqFoP71wPmXjjUwLT70+qvX4hdyYfO
JcjeTz5QKtg8zQwxaK9x4JT9CoOmoVdVhEBAiD3DwR5fFgOHDwwGxdJWVBvktnoA
zjdTLXDdbSVC5jZ0u8oq9BiTDv7jAlsB5F8aZgvSZDOQeFrwaOTbKWSEInEhnchK
ZTD1dz6aBlk1xGEI5PZWAnVAba/ofH33ktymaTDsE6xRDnW97pDkimCRak6CEbfe
3dXw6OV5AgMBAAGjggFPMIIBSzAdBgNVHQ4EFgQUf9OZ86BHDjEAVlYijrfMnt3K
AYowHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDgYDVR0PAQH/BAQD
AgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjASBgNVHRMBAf8ECDAG
AQH/AgEAMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
ZGlnaWNlcnQuY29tMEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9jcmwzLmRpZ2lj
ZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RDQS5jcmwwTAYDVR0gBEUwQzA3Bglg
hkgBhv1sAQIwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29t
L0NQUzAIBgZngQwBAgEwDQYJKoZIhvcNAQELBQADggEBAK3dVOj5dlv4MzK2i233
lDYvyJ3slFY2X2HKTYGte8nbK6i5/fsDImMYihAkp6VaNY/en8WZ5qcrQPVLuJrJ
DSXT04NnMeZOQDUoj/NHAmdfCBB/h1bZ5OGK6Sf1h5Yx/5wR4f3TUoPgGlnU7EuP
ISLNdMRiDrXntcImDAiRvkh5GJuH4YCVE6XEntqaNIgGkRwxKSgnU3Id3iuFbW9F
UQ9Qqtb1GX91AJ7i4153TikGgYCdwYkBURD8gSVe8OAco6IfZOYt/TEwii1Ivi1C
qnuUlWpsF1LdQNIdfbW3TSe0BhQa7ifbVIfvPWHYOu3rkg1ZeMo6XRU9B4n5VyJY
RmE=
-----END CERTIFICATE-----
src/main/resources/2_www.begogirls.com.key 0 → 100644
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEA0OhIoskQbp88V0dManS5hIBFk/lrrgRNnObmIfyAzl72sFci
jQTsANK11U1DQfp4t+5FQRuGvemewdeT1lxvBnoHYEby2n1QWErAcxm62x59FDS5
MOnAgDWTGPDCVLZetBz5oX6hdDneTZwFu8eiYWKAiBoD/FLTiZAuf8J1n4JrNn4m
vgxgZkwfk+UbLVPRS5Y3jiC95bHpuzPC1rZWemojAKKJlYD8xi4z2ehtwdc+GFTy
9A87sh3BNtv2zBNC4GkDFGuADTBgJwG1rryVT7te9oSrtvAdY9BSAafrvSth7e8U
TVTIRTPe7RoGtK40lHWDZt2dfO0Qza+cOOm9VQIDAQABAoH/LoZYeBSHtgq25jfF
xALsaZleq7TSK4iW4WvX/3u+p4yYzfXpu0MTt6IXZ9s2cqaQFtoMWfL25+fuuN3q
Sqvx1C7pnYmKU/EXYnFp8w8JRKEOk5XoSuGSkuUOgJIFKREDnGI1LdjldZ1U4t9A
SVtSVLzgtbv8uoQ+lBlc1lqeTHdPLw5Puv/+XLFUqCPVAe7Yxh5VUXyN2Tps+6gW
Yh4BafJfRRZHsFxWgm6kfhGXyc5cddJHLiSKj1OO+ufZSCnAtdxSJQCi7zE7sZvD
+wzXhg5pdFGcpO0ll5a0gz37SuzEXY45zqzq4kNl9/TJbUBtMwu3J/rO+fLYD+iy
2PD5AoGBAOwYYsOAQ8D/DQ952dWxk97Ko2ta25gtDTx+qIzTUr8X1tsVu7grMdoB
zegmtLdeKHOGGKqaTc7J0Y+9iPiMYcEBiG2vVo/imZnWHa1VRtymSLDp3/st91Cr
EwAx5kgATWRVD/D9zmG51/6EGL8fojKw29x9M0iQkHyzTpKbXQ3tAoGBAOKFGt2j
7L60nRUTFymXHjsn0e6CqDn0kn+afe5XcgUV8yB27pWik6vjw+fOYJSw8654dEgB
WI2vnjwk1fC4gzsaWHuW4WpcSnx5XI58QNddAUQ0dA/45b/Oy/EYbW0k72S20WcJ
kvVDcNGxg1ZmJlbwbz61P6TF0C+tgNSurUAJAoGBAJn77a6E4avmraYCW0k84KzW
jW9fewntmEx0b4op6jYoXkHWEvEzevgtZRac6BEQoGF4fG4I5eaRStTtUYCKTteL
IGgpi9Ocf4IOXJzImccfzRlV8Hfqqvs6GNJvuToMuG1P7W3Im+qxQ2cE0P8WqrtV
DpDoN6KEZzht2jlUi4ShAoGBAKN8dbtpyECLkqPXN2xpCQSg5L9Dxa6ued1m32TZ
8A0DnonbzK5qvDHfHVF8ffBTFkzh2urtLcB087tsyowGX5CUny/z4ZUmLwxPeyHL
Q/EryvIy+WFdvlQFKORFQRT5B16lI9U977bcidyORcBh0WIF/gRARELkEjGXA9h8
icYhAoGBAJJ85K12hYyt//to0TUcC1yzf1dnZotfO3tbVEkTglPTPwNSmRa6JvNT
sz2XwDSTmo3YzQcIyHfoZmQ1CkBi4lLh3wIHcOSBtYsvfBmvWpZc1lim6N3rpODZ
DE4qCzRqoXb+izfyScmXf13db3ups48QM9zkIokND8Avu2eUR6aW
-----END RSA PRIVATE KEY-----
\ No newline at end of file
src/main/resources/application.yml
......@@ -14,8 +14,8 @@ spring:
mybatis-plus:
mapper-locations:
- classpath:mapper/**/*.xml
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# configuration:
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
server:
undertow:
......
src/main/resources/mapper/LeisureDiscountConfigLimitMapper.xml
......@@ -16,4 +16,29 @@
where t1.date = #{date}
and t1.leisure_discount_config_id = #{leisureDiscountConfigId}
</select>
<select id="selectOneLeisureDiscountConfig"
resultType="com.gogirl.domain.market.discount.LeisureDiscountConfigLimit">
SELECT t9.*
from leisure_discount_config t1
LEFT JOIN leisure_discount_config_week t2 on t1.id = t2.leisure_discount_config_id
LEFT JOIN leisure_discount_config_service t3 on t1.id = t3.leisure_discount_config_id
LEFT JOIN time_node t5 on t1.start_time &lt;= t5.time_node and t1.end_time &gt;= t5.time_node
LEFT JOIN base_serve t6 on t3.service_id = t6.id
LEFT JOIN week_config t7 on t2.`week` = t7.`week`
LEFT JOIN store_manage t8 on t1.department_id = t8.id
LEFT JOIN leisure_discount_config_limit t9
on t1.id = t9.leisure_discount_config_id and t9.left_times > 0 and
t7.week_date = t9.date
where t1.is_enabled = 1
and t2.id is not null
and t3.id is not null
and t9.id is not null
and t1.id = #{leisureDiscountConfigId}
and t3.service_id = #{serveId}
and t5.time_node = #{time}
and t7.week_date = #{date}
limit 1
</select>
</mapper>
src/main/resources/mapper/market/LeisureDiscountConfigMapper.xml
......@@ -2,31 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigMapper">
<select id="selectIsLeisureTime" resultType="com.gogirl.domain.market.discount.LeisureDiscountConfig">
select *
from leisure_discount_config t1
left join leisure_discount_config_service t2 on t1.id = t2.leisure_discount_config_id
left join leisure_discount_config_week t4 on t1.id = t4.leisure_discount_config_id
where t1.start_time &lt;= #{time}
and t1.end_time &gt;= #{time}
and t2.service_id = #{serveId}
and t1.is_enabled = 1
and t1.left_times &gt; 0
and t4.week = #{week}
</select>
<select id="selectByDepartmentId" resultType="com.gogirl.domain.product.serve.BaseServe">
select t3.*
from leisure_discount_config t1
left join leisure_discount_config_service t2 on t1.id = t2.leisure_discount_config_id
left join leisure_discount_config_week t4 on t1.id = t4.leisure_discount_config_id
left join base_serve t3 on t2.service_id = t3.id
where t1.department_id = #{departmentId}
and t1.left_times &gt; 0
and t1.is_enabled = 1
and t3.id is not null
and t4.week = #{week}
</select>
<select id="queryMinDiscount" resultType="com.gogirl.domain.market.discount.LeisureDiscountConfig">
select *
......@@ -37,44 +13,5 @@
limit 1
</select>
<select id="selectLeisureDiscount" resultType="com.gogirl.domain.market.discount.LeisureDiscountConfig">
SELECT *
from leisure_discount_config t1
LEFT JOIN leisure_discount_config_service t2 on t1.id = t2.leisure_discount_config_id
LEFT JOIN leisure_discount_config_week t3 on t1.id = t3.leisure_discount_config_id
where t2.service_id = #{serviceId}
and t1.start_time &lt;= #{time}
and t1.end_time &gt;= #{time}
and t1.is_enabled = 1
and t3.week = #{weekday}
and t1.left_times &gt; 0
and t1.department_id = #{departmentId}
limit 1
</select>
<select id="selectByDepartmentIdAndWeekAndDateTime" resultType="com.gogirl.domain.product.serve.BaseServe">
select t3.*
from leisure_discount_config t1
left join leisure_discount_config_service t2 on t1.id = t2.leisure_discount_config_id
left join leisure_discount_config_week t4 on t1.id = t4.leisure_discount_config_id
left join base_serve t3 on t2.service_id = t3.id
where t1.department_id = #{departmentId}
and t1.is_enabled = 1
and t3.id is not null
and t4.week = #{week}
and t1.start_time &lt;= #{time}
and t1.end_time &gt;= #{time}
and t1.left_times &gt; 0
</select>
<select id="selectByDepartmentIdAndWeekIgnoreLimit"
resultType="com.gogirl.domain.market.discount.LeisureDiscountConfig">
select *
from leisure_discount_config t1
left join leisure_discount_config_week t2 on t1.id = t2.leisure_discount_config_id
where t1.department_id
and t2.week = #{week}
and t1.is_enabled = 1
</select>
</mapper>
\ No newline at end of file
</mapper>
src/main/resources/mapper/order/ScheduleManageMapper.xml
......@@ -245,7 +245,7 @@
LEFT JOIN base_serve t6 on t3.service_id =t6.id
LEFT JOIN week_config t7 on t2.`week` =t7.`week`
LEFT JOIN store_manage t8 on t1.department_id =t8.id
LEFT JOIN leisure_discount_config_limit t9 on t1.id =t9.leisure_discount_config_id and t9.left_times > 0
LEFT JOIN leisure_discount_config_limit t9 on t1.id =t9.leisure_discount_config_id and t9.left_times > 0 and t7.week_date = t9.date
where t1.is_enabled =1
and t2.id is not null
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment