yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java

This commit is contained in:
yangjun 2024-06-23 09:57:56 +08:00
parent 6deae852ef a2c415c3d8
commit 1e825d0230
3 changed files with 922 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1175
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

8
src/main/java/com/sqx/modules/common/enums/CommonEnum.java
View File

@ -22,10 +22,10 @@ public enum CommonEnum {
/**服务开始n分钟后不可以取消订单*/
V3_ORDER_FORM_CANCEL_START_02(440, "v3_order_form", "服务开始n分钟后不可以取消订单", "15"),
/**距离服务开始前n个小时可修改*/
V3_ORDER_FORM_EDIT_NOT_START_01(441, "v3_order_form", "距离服务开始前n个小时可修改", "2"),
/**距离服务开始n个小时内不可修改*/
V3_ORDER_FORM_EDIT_NOT_START_02(442, "v3_order_form", "距离服务开始n个小时内不可修改", "2"),
/**距离服务开始前n分钟可修改*/
V3_ORDER_FORM_EDIT_NOT_START_01(441, "v3_order_form", "距离服务开始前n分钟可修改", "120"),
/**距离服务开始n分钟内不可修改*/
V3_ORDER_FORM_EDIT_NOT_START_02(442, "v3_order_form", "距离服务开始n分钟内不可修改", "120"),
/**夏令时开始时间~结束时间*/
V3_TRAVEL_CONF_DAYLIGHT_SAVING_TIME(443, "v3_travel_conf", "夏令时开始时间~结束时间", "0521,0823"),

26
src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java
View File

@ -195,29 +195,21 @@ public class CommonInfoServiceImpl extends ServiceImpl<CommonInfoDao, CommonInfo
@Override
public boolean isCheckEditOrder(Date businessTime, Date nowTime) {
long bnDiffDay = DateUtil.between(businessTime, nowTime, DateUnit.DAY, false);
long bnDiffDay = DateUtil.between(nowTime, businessTime, DateUnit.MINUTE, false);
Map<Integer, CommonInfo> configMap = getMapByCondition(CommonEnum.GroupConditionEnum.V3_ORDER_FORM.getValue());
//距离服务开始前n个小时可修改 - 2
//距离服务开始前n分钟可修改 120
CommonInfo v3OrderFormEditNotStart01 = configMap.get(CommonEnum.V3_ORDER_FORM_EDIT_NOT_START_01.getKey());
//距离服务开始n个小时内不可修改 - 2
CommonInfo v3OrderFormEditNotStart02 = configMap.get(CommonEnum.V3_ORDER_FORM_EDIT_NOT_START_02.getKey());
Double v3OrderFormEditNotStart01I = CommonConfigUtil.getDoubleValue(v3OrderFormEditNotStart01.getValue());
if(v3OrderFormEditNotStart01I == null) v3OrderFormEditNotStart01I = -1D;
Double v3OrderFormEditNotStart02I = CommonConfigUtil.getDoubleValue(v3OrderFormEditNotStart02.getValue());
if(v3OrderFormEditNotStart02I == null) v3OrderFormEditNotStart02I = -1D;
Long v3OrderFormEditNotStart01I = CommonConfigUtil.getLongValue(v3OrderFormEditNotStart01.getValue());
if(v3OrderFormEditNotStart01I == null) v3OrderFormEditNotStart01I = 120L;
if(bnDiffDay >= 0) {
//正数，服务开始前
if(v3OrderFormEditNotStart01I == -1) return true;
return bnDiffDay >= v3OrderFormEditNotStart01I;
} else {
//负数，服务开始后
if(v3OrderFormEditNotStart02I == -1) return true;
double burdenV3OrderFormEditNotStart02I = - v3OrderFormEditNotStart02I;
return burdenV3OrderFormEditNotStart02I >= bnDiffDay;
if(bnDiffDay >= v3OrderFormEditNotStart01I) {
return true;
}else{
return false;
}
}
}