diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java new file mode 100644 index 00000000..985bfab5 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java @@ -0,0 +1,136 @@ +package com.ghy.web.controller.order; + +import java.util.List; +import com.ghy.order.domain.OrderCallRecord; +import com.ghy.order.service.IOrderCallRecordService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import com.ghy.common.annotation.Log; +import com.ghy.common.enums.BusinessType; +import com.ghy.common.core.controller.BaseController; +import com.ghy.common.core.domain.AjaxResult; +import com.ghy.common.utils.poi.ExcelUtil; +import com.ghy.common.core.page.TableDataInfo; + +/** + * 订单约单记录Controller + * + * @author clunt + * @date 2023-06-04 + */ +@Controller +@RequestMapping("/order/record") +public class OrderCallRecordController extends BaseController +{ + private String prefix = "order/record"; + + @Autowired + private IOrderCallRecordService orderCallRecordService; + + @RequiresPermissions("worker:record:view") + @GetMapping() + public String record() + { + return prefix + "/record"; + } + + /** + * 查询订单约单记录列表 + */ + @RequiresPermissions("worker:record:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(OrderCallRecord orderCallRecord) + { + startPage(); + List list = orderCallRecordService.selectOrderCallRecordList(orderCallRecord); + return getDataTable(list); + } + + /** + * App查询订单约单记录列表 + */ + @PostMapping("/app/list") + @ResponseBody + public TableDataInfo appList(@RequestBody OrderCallRecord orderCallRecord) + { + startPage(); + List list = orderCallRecordService.selectOrderCallRecordList(orderCallRecord); + return getDataTable(list); + } + + + /** + * 导出订单约单记录列表 + */ + @RequiresPermissions("worker:record:export") + @Log(title = "订单约单记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(OrderCallRecord orderCallRecord) + { + List list = orderCallRecordService.selectOrderCallRecordList(orderCallRecord); + ExcelUtil util = new ExcelUtil(OrderCallRecord.class); + return util.exportExcel(list, "订单约单记录数据"); + } + + /** + * 新增订单约单记录 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存订单约单记录 + */ + @RequiresPermissions("worker:record:add") + @Log(title = "订单约单记录", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(OrderCallRecord orderCallRecord) + { + return toAjax(orderCallRecordService.insertOrderCallRecord(orderCallRecord)); + } + + /** + * 修改订单约单记录 + */ + @RequiresPermissions("worker:record:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + OrderCallRecord orderCallRecord = orderCallRecordService.selectOrderCallRecordById(id); + mmap.put("orderCallRecord", orderCallRecord); + return prefix + "/edit"; + } + + /** + * 修改保存订单约单记录 + */ + @RequiresPermissions("worker:record:edit") + @Log(title = "订单约单记录", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(OrderCallRecord orderCallRecord) + { + return toAjax(orderCallRecordService.updateOrderCallRecord(orderCallRecord)); + } + + /** + * 删除订单约单记录 + */ + @RequiresPermissions("worker:record:remove") + @Log(title = "订单约单记录", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(orderCallRecordService.deleteOrderCallRecordByIds(ids)); + } +} diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index cdbf22b3..c29b7b56 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -24,14 +24,8 @@ import com.ghy.goods.service.GoodsAreaService; import com.ghy.goods.service.GoodsImgsService; import com.ghy.goods.service.GoodsService; import com.ghy.goods.service.GoodsStandardService; -import com.ghy.order.domain.AfterServiceRecord; -import com.ghy.order.domain.OrderDetail; -import com.ghy.order.domain.OrderGoods; -import com.ghy.order.domain.OrderMaster; -import com.ghy.order.service.IAfterServiceRecordService; -import com.ghy.order.service.OrderDetailService; -import com.ghy.order.service.OrderGoodsService; -import com.ghy.order.service.OrderMasterService; +import com.ghy.order.domain.*; +import com.ghy.order.service.*; import com.ghy.payment.domain.FinancialChangeRecord; import com.ghy.payment.domain.FinancialDetail; import com.ghy.payment.domain.FinancialMaster; @@ -110,6 +104,8 @@ public class OrderMasterController extends BaseController { private IAfterServiceRecordService afterServiceRecordService; @Resource private FinancialChangeRecordService financialChangeRecordService; + @Autowired + private IOrderCallRecordService orderCallRecordService; @RequiresPermissions("order:master:view") @GetMapping() @@ -726,6 +722,25 @@ public class OrderMasterController extends BaseController { } } + @PostMapping("/callCustomer") + @ResponseBody + public AjaxResult callCustomer(@RequestBody OrderMaster orderMaster) { + try { + int i = orderMasterService.updateOrderMaster(orderMaster); + if(i > 0){ + OrderCallRecord param = new OrderCallRecord(); + param.setOrderId(orderMaster.getId()); + param.setCallTime(new Date()); + param.setOrderType("01"); + orderCallRecordService.insertOrderCallRecord(param); + } + return AjaxResult.success(); + } catch (Exception e) { + e.printStackTrace(); + return AjaxResult.error(); + } + } + /** * 校验主订单编码 */ diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java new file mode 100644 index 00000000..d080c14c --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java @@ -0,0 +1,36 @@ +package com.ghy.order.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import com.ghy.common.annotation.Excel; +import com.ghy.common.core.domain.BaseEntity; + +/** + * 订单约单记录对象 order_call_record + * + * @author clunt + * @date 2023-06-04 + */ +@Data +public class OrderCallRecord extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 订单号 */ + @Excel(name = "订单号") + private Long orderId; + + /** 订单类型 01.主单 02.子单 */ + @Excel(name = "订单类型 01.主单 02.子单") + private String orderType; + + /** 联系时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "联系时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date callTime; + +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index 2f9346f7..427dc6e4 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -143,4 +143,10 @@ public class OrderMaster extends BaseEntity { private String orderMode; private Integer sysPayStatus; + + /** + * 是否约单 + * */ + private String isCall; + } diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderCallRecordMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderCallRecordMapper.java new file mode 100644 index 00000000..76925acb --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderCallRecordMapper.java @@ -0,0 +1,63 @@ +package com.ghy.order.mapper; + +import com.ghy.order.domain.OrderCallRecord; + +import java.util.List; + +/** + * 订单约单记录Mapper接口 + * + * @author clunt + * @date 2023-06-04 + */ +public interface OrderCallRecordMapper +{ + /** + * 查询订单约单记录 + * + * @param id 订单约单记录主键 + * @return 订单约单记录 + */ + public OrderCallRecord selectOrderCallRecordById(Long id); + + /** + * 查询订单约单记录列表 + * + * @param orderCallRecord 订单约单记录 + * @return 订单约单记录集合 + */ + public List selectOrderCallRecordList(OrderCallRecord orderCallRecord); + + /** + * 新增订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + public int insertOrderCallRecord(OrderCallRecord orderCallRecord); + + /** + * 修改订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + public int updateOrderCallRecord(OrderCallRecord orderCallRecord); + + /** + * 删除订单约单记录 + * + * @param id 订单约单记录主键 + * @return 结果 + */ + public int deleteOrderCallRecordById(Long id); + + /** + * 批量删除订单约单记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteOrderCallRecordByIds(String[] ids); + +} diff --git a/ghy-order/src/main/java/com/ghy/order/service/IOrderCallRecordService.java b/ghy-order/src/main/java/com/ghy/order/service/IOrderCallRecordService.java new file mode 100644 index 00000000..3b41a67f --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/service/IOrderCallRecordService.java @@ -0,0 +1,62 @@ +package com.ghy.order.service; + +import com.ghy.order.domain.OrderCallRecord; + +import java.util.List; + +/** + * 订单约单记录Service接口 + * + * @author clunt + * @date 2023-06-04 + */ +public interface IOrderCallRecordService +{ + /** + * 查询订单约单记录 + * + * @param id 订单约单记录主键 + * @return 订单约单记录 + */ + public OrderCallRecord selectOrderCallRecordById(Long id); + + /** + * 查询订单约单记录列表 + * + * @param orderCallRecord 订单约单记录 + * @return 订单约单记录集合 + */ + public List selectOrderCallRecordList(OrderCallRecord orderCallRecord); + + /** + * 新增订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + public int insertOrderCallRecord(OrderCallRecord orderCallRecord); + + /** + * 修改订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + public int updateOrderCallRecord(OrderCallRecord orderCallRecord); + + /** + * 批量删除订单约单记录 + * + * @param ids 需要删除的订单约单记录主键集合 + * @return 结果 + */ + public int deleteOrderCallRecordByIds(String ids); + + /** + * 删除订单约单记录信息 + * + * @param id 订单约单记录主键 + * @return 结果 + */ + public int deleteOrderCallRecordById(Long id); +} diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderCallRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderCallRecordServiceImpl.java new file mode 100644 index 00000000..e72972c0 --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderCallRecordServiceImpl.java @@ -0,0 +1,96 @@ +package com.ghy.order.service.impl; + +import java.util.List; + +import com.ghy.order.domain.OrderCallRecord; +import com.ghy.order.mapper.OrderCallRecordMapper; +import com.ghy.order.service.IOrderCallRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ghy.common.core.text.Convert; + +/** + * 订单约单记录Service业务层处理 + * + * @author clunt + * @date 2023-06-04 + */ +@Service +public class OrderCallRecordServiceImpl implements IOrderCallRecordService +{ + @Autowired + private OrderCallRecordMapper orderCallRecordMapper; + + /** + * 查询订单约单记录 + * + * @param id 订单约单记录主键 + * @return 订单约单记录 + */ + @Override + public OrderCallRecord selectOrderCallRecordById(Long id) + { + return orderCallRecordMapper.selectOrderCallRecordById(id); + } + + /** + * 查询订单约单记录列表 + * + * @param orderCallRecord 订单约单记录 + * @return 订单约单记录 + */ + @Override + public List selectOrderCallRecordList(OrderCallRecord orderCallRecord) + { + return orderCallRecordMapper.selectOrderCallRecordList(orderCallRecord); + } + + /** + * 新增订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + @Override + public int insertOrderCallRecord(OrderCallRecord orderCallRecord) + { + return orderCallRecordMapper.insertOrderCallRecord(orderCallRecord); + } + + /** + * 修改订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + @Override + public int updateOrderCallRecord(OrderCallRecord orderCallRecord) + { + return orderCallRecordMapper.updateOrderCallRecord(orderCallRecord); + } + + /** + * 批量删除订单约单记录 + * + * @param ids 需要删除的订单约单记录主键 + * @return 结果 + */ + @Override + public int deleteOrderCallRecordByIds(String ids) + { + return orderCallRecordMapper.deleteOrderCallRecordByIds(Convert.toStrArray(ids)); + } + + /** + * 删除订单约单记录信息 + * + * @param id 订单约单记录主键 + * @return 结果 + */ + @Override + public int deleteOrderCallRecordById(Long id) + { + return orderCallRecordMapper.deleteOrderCallRecordById(id); + } + +} \ No newline at end of file diff --git a/ghy-order/src/main/resources/mapper/order/OrderCallRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderCallRecordMapper.xml new file mode 100644 index 00000000..876ea0d8 --- /dev/null +++ b/ghy-order/src/main/resources/mapper/order/OrderCallRecordMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + select id, order_id, order_type, call_time from order_call_record + + + + + + + + insert into order_call_record + + order_id, + order_type, + call_time, + + + #{orderId}, + #{orderType}, + #{callTime}, + + + + + update order_call_record + + order_id = #{orderId}, + order_type = #{orderType}, + call_time = #{callTime}, + + where id = #{id} + + + + delete from order_call_record where id = #{id} + + + + delete from order_call_record where id in + + #{id} + + + + \ No newline at end of file diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 2874b1f1..66b35d78 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -30,6 +30,7 @@ + @@ -55,7 +56,8 @@ all_self_assigned, goods_id, timeout_, - timeout_fine_times + timeout_fine_times, + is_call FROM order_master @@ -81,7 +83,8 @@ om.all_self_assigned, om.goods_id, om.timeout_, - om.timeout_fine_times + om.timeout_fine_times, + om.is_call FROM order_master om LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id LEFT JOIN goods g ON g.goods_id = om.goods_id @@ -177,6 +180,9 @@ AND om.timeout_ = #{timeout} + + AND om.ic_call = #{isCall} + order by om.create_time @@ -239,6 +245,9 @@ AND om.id in (${orderMasterIds}) + + AND om.ic_call = #{isCall} + @@ -280,6 +289,7 @@ all_self_assigned = #{allSelfAssigned}, all_self_assigned = null, has_dispatched_all = #{hasDispatchedAll}, + is_call = #{isCall}, update_time = SYSDATE() WHERE id = #{id}