Commit 6b06d1ed by 黄森林

恢复代码

parent 8d531142
...@@ -19,6 +19,7 @@ import com.winsun.mapper.AppMapper; ...@@ -19,6 +19,7 @@ import com.winsun.mapper.AppMapper;
import com.winsun.mapper.SchoolMapper; import com.winsun.mapper.SchoolMapper;
import com.winsun.mapper.SysUserMapper; import com.winsun.mapper.SysUserMapper;
import com.winsun.utils.ImportExcel; import com.winsun.utils.ImportExcel;
import com.winsun.utils.MyBatisPlusUpdateUtils;
import com.winsun.utils.YrymReportUtils; import com.winsun.utils.YrymReportUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.HorizontalAlignment;
...@@ -70,6 +71,30 @@ public class OrderController extends BaseController { ...@@ -70,6 +71,30 @@ public class OrderController extends BaseController {
OrderController.appMapper = appMapper; OrderController.appMapper = appMapper;
} }
/**
* 查询订单历史状态
*/
@RequestMapping(value = "selectOrderHis", method = RequestMethod.POST)
public ResponseData<List<Map<String, Object>>> selectOrderHis(@RequestParam("orderId") String orderId) {
List<Map<String, Object>> list = orderMapper.selectOrderHis(orderId);
return ResponseData.success(list);
}
/**
* 修改为异常单
*/
@RequestMapping(value = "abnormal", method = RequestMethod.POST)
public ResponseData<String> abnormal(@RequestParam("orderId") String orderId) {
Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("id", orderId);
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("order_status","异常单");
Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
if(integer == 1){
return ResponseData.success("设为异常单成功!");
}
return ResponseData.error("设为异常单失败!");
}
/** /**
* @param createTimeStart 订单创建时间开始 * @param createTimeStart 订单创建时间开始
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment