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

订单增加赠送时长字段，增加服务暂停管理列表，身份证号验证方法优化

Browse Source
This commit is contained in:
xiezhijun
2021-01-07 19:17:52 +08:00
parent d80f3aca1a
commit 340399c720
15 changed files with 1061 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java
View File

@@ -1,11 +1,9 @@
package com.stdiet.web.controller.custom;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import com.stdiet.custom.domain.SysPhysicalSigns;
import org.apache.commons.lang.StringUtils;
import com.stdiet.common.utils.bean.ObjectUtils;
import com.stdiet.custom.dto.request.CustomerInvestigateRequest;
@@ -67,6 +65,7 @@ public class SysCustomerController extends BaseController
CustomerListResponse customerListResponse = null;
for (SysCustomer customer : list) {
customerListResponse = ObjectUtils.getObjectByObject(customer.getSign(), CustomerListResponse.class);
customerListResponse.setCreateTime(customer.getCreateTime());
customerListResponse.setName(customer.getName());
customerListResponse.setPhone(customer.getPhone());
StringBuilder signStr = new StringBuilder();

106
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderPauseController.java Normal file
View File

@@ -0,0 +1,106 @@
package com.stdiet.web.controller.custom;
import java.text.SimpleDateFormat;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.custom.domain.SysOrderPause;
import com.stdiet.custom.service.ISysOrderPauseService;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.common.core.page.TableDataInfo;
/**
* 订单服务暂停Controller
*
* @author wonder
* @date 2021-01-07
*/
@RestController
@RequestMapping("/orderPause/pause")
public class SysOrderPauseController extends BaseController
{
@Autowired
private ISysOrderPauseService sysOrderPauseService;
/**
* 查询订单服务暂停列表
*/
@PreAuthorize("@ss.hasPermi('orderPause:pause:query')")
@GetMapping("/list")
public TableDataInfo list(SysOrderPause sysOrderPause)
{
startPage();
List<SysOrderPause> list = sysOrderPauseService.selectSysOrderPauseList(sysOrderPause);
return getDataTable(list);
}
/**
* 导出订单服务暂停列表
*/
@PreAuthorize("@ss.hasPermi('orderPause:pause:export')")
@Log(title = "订单服务暂停", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(SysOrderPause sysOrderPause)
{
List<SysOrderPause> list = sysOrderPauseService.selectSysOrderPauseList(sysOrderPause);
ExcelUtil<SysOrderPause> util = new ExcelUtil<SysOrderPause>(SysOrderPause.class);
return util.exportExcel(list, "pause");
}
/**
* 获取订单服务暂停详细信息
*/
@PreAuthorize("@ss.hasPermi('orderPause:pause:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(sysOrderPauseService.selectSysOrderPauseById(id));
}
/**
* 新增订单服务暂停
*/
@PreAuthorize("@ss.hasPermi('orderPause:pause:add')")
@Log(title = "订单服务暂停", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SysOrderPause sysOrderPause)
{
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
System.out.println(simpleDateFormat.format(sysOrderPause.getPauseStartDate()));
return toAjax(sysOrderPauseService.insertSysOrderPause(sysOrderPause));
}
/**
* 修改订单服务暂停
*/
@PreAuthorize("@ss.hasPermi('orderPause:pause:edit')")
@Log(title = "订单服务暂停", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SysOrderPause sysOrderPause)
{
return toAjax(sysOrderPauseService.updateSysOrderPause(sysOrderPause));
}
/**
* 删除订单服务暂停
*/
@PreAuthorize("@ss.hasPermi('orderPause:pause:remove')")
@Log(title = "订单服务暂停", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sysOrderPauseService.deleteSysOrderPauseByIds(ids));
}
}