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

Compare commits

base: yangjun:b62fc99d2b3f3108ef60dd31f66a626bd4fd84da
Branches Tags
yangjun:master
...
compare: yangjun:5fcf0b129845861d0e8bcf664b389976df873618
Branches Tags
yangjun:master

2 Commits
b62fc99d2b ... 5fcf0b1298

Author SHA1 Message Date
曹磊 5fcf0b1298 去掉main函数 2024-07-09 21:05:39 +08:00
曹磊 5355f98591 项目详情汇总金额 2024-07-09 21:04:34 +08:00
1 changed files with 21 additions and 130 deletions
Show Stats Expand all files Collapse all files

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

@ -615,126 +615,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
} }
} }
public static void main(String[] args) {
String value1 = "是";
Integer duration = 90;
int beforeTimeInt = 0;
int afterTimeInt = 30;
int jyMinuteInt = 30;
Integer tripWay = 1;
int cxsjInt = 0;
if(Objects.nonNull(tripWay)){
if(tripWay.equals(1)){
cxsjInt = 60;
}
if(tripWay.equals(2)){
cxsjInt = 30;
}
if(tripWay.equals(3)){
cxsjInt = 60;
}
}
beforeTimeInt = beforeTimeInt + cxsjInt; //服务时间前锁单时间
int minute=0;
int i = 0;
int f = 0;
int a = 0;
if ("是".equals(value1)) {
minute = jyMinuteInt;
if (duration % minute == 0) {
i = duration / minute;
} else {
i = duration / minute;
i++;
}
if (beforeTimeInt % minute == 0) {
f = beforeTimeInt / minute;
} else {
f = beforeTimeInt / minute;
f++;
}
if (afterTimeInt % minute == 0) {
a = afterTimeInt / minute;
} else {
a = afterTimeInt / minute;
a++;
}
}
String serveTime = "2024-07-08 15:30";
List<String> allTime = new ArrayList<>();
Date parse = DateUtils.stringToDate(serveTime,"yyyy-MM-dd HH:mm");
if (f > 0) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(parse);
for (int j = 0; j < f; j++) {
calendar.add(Calendar.MINUTE, -minute);
String format = DateUtils.format(calendar.getTime(),"yyyy-MM-dd HH:mm");
allTime.add(format);
}
}
//服务时间后锁单时间判断
if (i > 0) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(parse);
for (int j = 0; j < i; j++) {
calendar.add(Calendar.MINUTE, minute);
String format = DateUtils.format(calendar.getTime(),"yyyy-MM-dd HH:mm");
allTime.add(format);
}
}
if (a > 0) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(parse);
calendar.add(Calendar.MINUTE, minute*i);
for (int j = 0; j < a; j++) {
calendar.add(Calendar.MINUTE, minute);
String format = DateUtils.format(calendar.getTime(),"yyyy-MM-dd HH:mm");
allTime.add(format);
}
}
allTime.add(serveTime);
allTime.sort(Comparator.naturalOrder());
for(String item : allTime){
System.out.println(item);
}
Integer duration2 = 110;
int ii = 0;
if ("是".equals(value1)) {
minute = jyMinuteInt;
if (duration2 % minute == 0) {
ii = duration2 / minute;
} else {
ii = duration2 / minute;
ii++;
}
}
String serveTime2 = "2024-07-08 17:30";
String date1 = serveTime2.substring(0, 10);
String time1 = serveTime2.substring(11, 16);
System.out.println(date1);
System.out.println(time1);
List<String> allTime2 = new ArrayList<>();
Date parse2 = DateUtils.stringToDate(serveTime2,"yyyy-MM-dd HH:mm");
//服务时间后锁单时间判断
if (ii > 0) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(parse2);
for (int j = 0; j < ii; j++) {
calendar.add(Calendar.MINUTE, minute);
String format = DateUtils.format(calendar.getTime(),"yyyy-MM-dd HH:mm");
allTime2.add(format);
}
}
allTime2.sort(Comparator.naturalOrder());
for(String item : allTime2){
System.out.println(item);
}
}
@Override @Override
public Result insertOrders(Orders orders) { public Result insertOrders(Orders orders) {
String msg = ""; String msg = "";
@ -4367,19 +4247,24 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
} }
orders.setArtificer(artificer); orders.setArtificer(artificer);
} }
orders.setPayMoneyTotal(orders.getPayMoney());
orders.setArtificerMoneyTotal(orders.getArtificerMoney()); BigDecimal payMoneyTotal = BigDecimal.ZERO;
if(orders.getPayMoneyTotal() == null){ BigDecimal artificerMoneyTotal = BigDecimal.ZERO;
orders.setPayMoneyTotal(BigDecimal.ZERO); if(orders.getPayMoney()!=null){
payMoneyTotal = payMoneyTotal.add(orders.getPayMoney());
} }
if(orders.getArtificerMoneyTotal() == null){ if(orders.getArtificerMoney()!=null){
orders.setArtificerMoneyTotal(BigDecimal.ZERO); artificerMoneyTotal = artificerMoneyTotal.add(orders.getArtificerMoney());
} }
//获取是否有加钟订单 //获取是否有加钟订单
if(orders.getAddNum()!=null){ if(orders.getAddNum()!=null){
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(orders.getAddMoney())); if(orders.getAddMoney()!=null){
orders.setArtificerMoneyTotal(orders.getArtificerMoneyTotal().add(orders.getAddArtificerMoney())); payMoneyTotal = payMoneyTotal.add(orders.getAddMoney());
}
if(orders.getAddArtificerMoney()!=null){
artificerMoneyTotal = artificerMoneyTotal.add(orders.getAddArtificerMoney());
}
} }
//获取是否有改价订单 //获取是否有改价订单
@ -4397,9 +4282,15 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
// } // }
// } // }
Orders oldOrders = getTotalMoney(orders); Orders oldOrders = getTotalMoney(orders);
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(oldOrders.getPayMoney())); if(oldOrders.getPayMoney()!=null){
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(oldOrders.getArtificerMoney())); payMoneyTotal = payMoneyTotal.add(oldOrders.getPayMoney());
}
if(oldOrders.getArtificerMoney()!=null){
artificerMoneyTotal = artificerMoneyTotal.add(oldOrders.getArtificerMoney());
}
} }
orders.setPayMoneyTotal(payMoneyTotal);
orders.setPayMoneyTotal(artificerMoneyTotal);
return Result.success().put("data", orders); return Result.success().put("data", orders);
} }