abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

已核销的订单不能进行删除

Browse Source
This commit is contained in:
ryoeiken 2021-01-13 16:04:33 +08:00
parent d0191ba05d
commit 647bb9d69d
3 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerTypeUtils.java
View File

@ -24,16 +24,37 @@ public class DinnerTypeUtils {
return instance;
}
private final Date breakfastStart;
private final Date breakfastEnd;
public void updateDinnerTypeUtils(String settings){
String[] setting = settings.split(",");
if (setting.length != 6) {
return;
}
String today = DateUtil.today();
this.breakfastStart = DateUtil.parse(today + " " + setting[0]);
this.breakfastEnd = DateUtil.parse(today + " " + setting[1]);
private final Date lunchStart;
private final Date lunchEnd;
this.lunchStart = DateUtil.parse(today + " " + setting[2]);
this.lunchEnd = DateUtil.parse(today + " " + setting[3]);
private final Date dinnerStart;
private final Date dinnerEnd;
this.dinnerStart = DateUtil.parse(today + " " + setting[4]);
this.dinnerEnd = DateUtil.parse(today + " " + setting[5]);
}
private Date breakfastStart;
private Date breakfastEnd;
private Date lunchStart;
private Date lunchEnd;
private Date dinnerStart;
private Date dinnerEnd;
/**
* 初始化用餐类型判断基础类，加载用餐时间参数
* @param configDaoService
*/
private DinnerTypeUtils(IFtConfigDaoService configDaoService) {
Map<String, String> setting = configDaoService.getDinnerTimeSetting();

15
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtConfigDaoController.java
View File

@ -12,6 +12,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.fantang.common.DinnerTypeUtils;
import com.ruoyi.system.fantang.domain.FtConfigDao;
import com.ruoyi.system.fantang.service.IFtConfigDaoService;
import lombok.RequiredArgsConstructor;
@ -20,9 +21,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* 饭堂参数Controller
@ -116,10 +115,8 @@ public class FtConfigDaoController extends BaseController {
@PostMapping("/updateDinnerTime")
public AjaxResult updateDinnerTime(@RequestBody JSONObject params) {
StringBuilder configValue = new StringBuilder();
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
JSONArray breakfastJson = params.getJSONArray("breakfast");
JSONArray lunchJson = params.getJSONArray("lunch");
@ -149,12 +146,10 @@ public class FtConfigDaoController extends BaseController {
}
}
UpdateWrapper<FtConfigDao> wrapper = new UpdateWrapper<>();
wrapper.eq("id", params.getLong("id"));
FtConfigDao ftConfigDao = new FtConfigDao();
ftConfigDao.setConfigValue(configValue.toString());
iFtConfigDaoService.updateConfigValue(params.getLong("id"),configValue.toString());
DinnerTypeUtils.getInstance(iFtConfigDaoService).updateDinnerTypeUtils(configValue.toString());
iFtConfigDaoService.update(ftConfigDao, wrapper);
return AjaxResult.success("已修改");
}

9
ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtOrderDaoServiceImpl.java
View File

@ -58,6 +58,7 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
dao.setStaffId(staffId);
dao.setOrderType(orderType);
dao.setOrderDate(demandDate);
dao.setCreateAt(new Date());
QueryWrapper<FtOrderDao> wrapper = new QueryWrapper<>();
wrapper.eq("staff_id", staffId);
wrapper.eq("order_type", orderType);
@ -108,9 +109,11 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
@Override
public AjaxResult cancelOrder(Long orderId) {
FtOrderDao dao = new FtOrderDao();
dao.setOrderId(orderId);
return AjaxResult.success(this.baseMapper.deleteById(dao));
QueryWrapper<FtOrderDao> wrapper = new QueryWrapper<>();
wrapper.eq("order_id",orderId);
wrapper.eq("write_off_flag", 0);
return AjaxResult.success(this.baseMapper.delete(wrapper));
}
@Override