xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

dev
lisai17@sina.com 2020-08-21 11:02:04 +08:00
parent 49cc8951bd
commit 3c17138802
2 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckController.java
View File

@ -73,38 +73,6 @@ public class PrepayTruckController extends BaseController {
renderJson(PrepayTruckSyncService.me.delete(model, tokenuser));
}
/**
* 恢复 prepay_truck 每日超市指定预付费车辆
*/
@Before(PrepayTruckPKValidator.class)
public void restore() {
Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));
if (tokenuser == null) {
renderJson(Result.noauth());
return;
}
PrepayTruck model = getModel(PrepayTruck.class, "", true); // 忽略不在model中的字段
renderJson(PrepayTruckSyncService.me.restore(model, tokenuser));
}
/**
* 修改 prepay_truck 每日超市指定预付费车辆
*/
@Before(PrepayTruckValidator.class)
public void edit() {
Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));
if (tokenuser == null) {
renderJson(Result.noauth());
return;
}
PrepayTruck model = getModel(PrepayTruck.class, "", true); // 忽略不在model中的字段
renderJson(PrepayTruckSyncService.me.update(model, tokenuser));
}
/**
* 分页查找 prepay_truck 每日超市指定预付费车辆
*/

43
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java
View File

@ -1,7 +1,6 @@
package com.cowr.service.ssjygl.prepay.prepaytruck;
import com.cowr.common.enums.Enums;
import com.cowr.common.enums.OrderStateEnum;
import com.cowr.common.enums.OrderTypeEnum;
import com.cowr.common.utils.DateTimeUtil;
import com.cowr.common.view.Result;
@ -41,7 +40,7 @@ public class PrepayTruckSyncService extends BaseSyncService {
List<Ordercluster> undonlist = OrderclusterService.me.undonlist(supermarket_id, customer_id, DateTimeUtil.sdf.get().format(valid_date));
if(undonlist == null || undonlist.isEmpty()){
if (undonlist == null || undonlist.isEmpty()) {
return Result.failed("未找到有效的集团订单信息");
}
@ -53,18 +52,25 @@ public class PrepayTruckSyncService extends BaseSyncService {
String[] truckarr = truckstr.split(",");
if(truckarr.length + old.size() < lastcluster.getMiniTruck()){
if (truckarr.length + old.size() < lastcluster.getMiniTruck()) {
return Result.failedstr("安排车辆总数不能小于 %d", lastcluster.getMiniTruck());
}
List<String> ts = new ArrayList<>();
List<String> tsql = new ArrayList<>();
Map<String, Integer> chkmap = new HashMap<>();
List<String> ts = new ArrayList<>();
List<String> tsql = new ArrayList<>();
List<PrepayTruck> pts = new ArrayList<>();
for (int i = 0; i < truckarr.length; i++) {
String truck_license = truckarr[i];
if (chkmap.containsKey(truck_license)) {
return Result.failedstr("不能输入重复的车牌 %s", truck_license);
} else {
chkmap.put(truck_license, 1);
}
ts.add(truck_license);
tsql.add("?");
}
@ -141,4 +147,31 @@ public class PrepayTruckSyncService extends BaseSyncService {
}
}
public Result delete(PrepayTruck model, Sysuser sysuser) {
PrepayTruck old = model.findByPk();
if (old == null) {
return Result.failed("未找到记录");
}
String valid_date = DateTimeUtil.sdf.get().format(old.getValidDate());
List<Ordercluster> undonlist = OrderclusterService.me.undonlist(old.getSupermarketId(), old.getCustomerId(), valid_date);
if (undonlist == null || undonlist.isEmpty()) {
return Result.failed("未找到有效的集团订单信息");
}
Ordercluster lastcluster = undonlist.get(0);
List<PrepayTruck> list = PrepayTruck.dao.find("select * from prepay_truck t\n" +
" where t.supermarket_id = ? \n" +
" and t.customer_id = ? \n" +
" and t.valid_date = ? ", old.getSupermarketId(), old.getCustomerId(), valid_date);
if (list.size() - 1 < lastcluster.getMiniTruck()) {
return Result.failedstr("安排车辆总数不能小于 %d", lastcluster.getMiniTruck());
}
return super.delete(model, sysuser);
}
}