From c29b1d7c9d312466cdbac1add88ee5c728135095 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 七月 2024 16:59:35 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
index 38514c8..89b722e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -107,7 +107,7 @@
//查询所有专车车型
Integer objectId = ShiroKit.getUser().getObjectId();
List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", objectId).ne("state", 3));
- List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1));
+ List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4));
List<TServerCarmodel> serverCarmodels = new ArrayList<>();
for(TServerCarmodel tsc : modelList){
boolean b = true;
@@ -175,7 +175,7 @@
@ResponseBody
public Object listSmall(String name,Integer state) {
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tSystemPriceService.getSpecialPriceList(page,ShiroKit.getUser().getObjectId(),name,state));
+ page.setRecords(tSystemPriceService.getSpecialPriceList1(page,ShiroKit.getUser().getObjectId(),name,state));
return super.packForBT(page);
}
@@ -245,6 +245,26 @@
return SUCCESS_TIP;
}
+ @RequestMapping(value = "/smallupdate")
+ @ResponseBody
+ public Object smallupdate(TSystemPrice tSystemPrice) {
+ TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
+ if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
+ //判断当前公司是否添加过该专车车型价格配置
+ int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
+ .eq("isPackage", 1)
+ .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
+ .eq("companyId",ShiroKit.getUser().getObjectId())
+ .last(" and not FIND_IN_SET(state,'3')"));
+ if (count > 0){
+ TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
+ return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
+ }
+ }
+ tSystemPriceService.updateById(tSystemPrice);
+ return SUCCESS_TIP;
+ }
+
/**
* 修改状态
*/
--
Gitblit v1.7.1