Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改订单，添加假删字段

Browse Source
This commit is contained in:
huangdeliang
2021-02-24 08:55:33 +08:00
parent df52ea8f2d
commit 62e2d22d24
14 changed files with 783 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java
View File

@ -84,8 +84,8 @@ public class SysOrderController extends OrderBaseController {
order.setPhone(StringUtils.hiddenPhoneNumber(order.getPhone()));
}
//根据服务时长、赠送天数计算服务天数
int month = order.getServeTimeId() != null ? order.getServeTimeId().intValue()/30 : 0;
if(order.getStartTime() != null && order.getServerEndTime() != null && order.getServeTimeId() != null && month > 0){
int month = order.getServeTimeId() != null ? order.getServeTimeId().intValue() / 30 : 0;
if (order.getStartTime() != null && order.getServerEndTime() != null && order.getServeTimeId() != null && month > 0) {
long serverDay = ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(order.getStartTime()), DateUtils.dateToLocalDate(order.getStartTime()).plusMonths(month).plusDays(order.getGiveServeDay() == null ? 0 : order.getGiveServeDay())) + 1;
order.setServerDay(Integer.parseInt(serverDay + ""));
}
@ -155,9 +155,9 @@ public class SysOrderController extends OrderBaseController {
@GetMapping(value = "/getInfoDetail")
public AjaxResult getInfoDetail(@RequestParam("orderId") Long orderId) {
SysOrder order = sysOrderService.selectSysOrderById(orderId);
if(order != null){
if (order != null) {
List<SysUser> userList = userService.selectAllUser();
for(SysUser user : userList){
for (SysUser user : userList) {
if (user.getUserId().equals(order.getPreSaleId())) {
order.setPreSale(user.getNickName());
}
@ -212,9 +212,9 @@ public class SysOrderController extends OrderBaseController {
*/
@PreAuthorize("@ss.hasPermi('custom:order:remove')")
@Log(title = "销售订单", businessType = BusinessType.DELETE)
@DeleteMapping("/{orderIds}")
public AjaxResult remove(@PathVariable Long[] orderIds) {
return toAjax(sysOrderService.deleteSysOrderByIds(orderIds));
@DeleteMapping("/{orderId}")
public AjaxResult remove(@PathVariable Long orderId) {
return toAjax(sysOrderService.deleteSysOrderById(orderId));
}