修改订单id为Long类型

leromro-core/src/main/java/com/leromro/core/controller/OrderRefundController.java

@@ -42,15 +42,15 @@ public class OrderRefundController extends BaseController
     /**
      * 查询订单取消/退款列表
      */
-    @ApiOperation(value ="查询 ", notes = "订单取消/退款列表")
-    /*@PreAuthorize("@ss.hasPermi('core:refund:list')")*/
+/*    @ApiOperation(value ="查询 ", notes = "订单取消/退款列表")
+    *//*@PreAuthorize("@ss.hasPermi('core:refund:list')")*//*
     @GetMapping("/list")
     public TableDataInfo<OrderRefund> list(OrderRefund orderRefund)
     {
         startPage();
         List<OrderRefund> list = lOrderRefundService.selectLOrderRefundList(orderRefund);
         return getDataTable(list);
-    }
+    }*/
     @ApiOperation(value ="web端 退款列表", notes = "传入分页参数")
     @GetMapping("web/list")
     public TableDataInfo<WebOrderRefundVO> refundList(MainOrders mainOrders){
@@ -111,26 +111,26 @@ public class OrderRefundController extends BaseController
     /**
      * 修改订单取消/退款
      */
-    @ApiOperation(value ="修改订单取消/退款", notes = "传入分页参数")
-   /* @PreAuthorize("@ss.hasPermi('core:refund:edit')")*/
-    /*@Log(title = "修改订单取消/退款", businessType = BusinessType.UPDATE)*/
+ /*   @ApiOperation(value ="修改订单取消/退款", notes = "传入分页参数")
+   *//* @PreAuthorize("@ss.hasPermi('core:refund:edit')")*//*
+    *//*@Log(title = "修改订单取消/退款", businessType = BusinessType.UPDATE)*//*
     @PutMapping("/updateRefund")
     public AjaxResult edit(@RequestBody OrderRefund orderRefund)
     {
         return toAjax(lOrderRefundService.updateLOrderRefund(orderRefund));
-    }
+    }*/
 
     /**
      * 删除订单取消/退款
      */
-    @ApiOperation( value ="删除订单取消/退款", notes = "传入id数组，批量删除")
-   /* @PreAuthorize("@ss.hasPermi('core:refund:remove')")*/
-   /* @Log(title = "删除订单取消/退款", businessType = BusinessType.DELETE)*/
+/*    @ApiOperation( value ="删除订单取消/退款", notes = "传入id数组，批量删除")
+   *//* @PreAuthorize("@ss.hasPermi('core:refund:remove')")*//*
+   *//* @Log(title = "删除订单取消/退款", businessType = BusinessType.DELETE)*//*
 	@DeleteMapping("/{orderRefundIds}")
     public R<Integer> remove(@PathVariable Long[] orderRefundIds)
     {
         return R.ok(lOrderRefundService.deleteLOrderRefundByOrderRefundIds(orderRefundIds));
-    }
+    }*/
     /**
      * 审批通过订单退款 以及后续流程。
      */

leromro-core/src/main/java/com/leromro/core/controller/OrdersController.java

@@ -79,7 +79,7 @@ public class OrdersController extends BaseController {
      */
     @ApiOperation("用户获取订单详细信息以及大订单所属小订单")
     @GetMapping("orderInfo/{mainOrderId}")
-    public R<OrdersInfoVO> getMainOrderInfo(@PathVariable("mainOrderId") String mainOrderId) {
+    public R<OrdersInfoVO> getMainOrderInfo(@PathVariable("mainOrderId") Long mainOrderId) {
         QueryWrapper<MainOrders> wrapper = new QueryWrapper<>();
         Long userId = SecurityUtils.getUserId();
         wrapper.eq("main_order_id", mainOrderId);
@@ -129,7 +129,7 @@ public class OrdersController extends BaseController {
      */
     @ApiOperation(value = "web管理端订单详情信息查询",notes = "传入订单mainOrderId")
     @GetMapping("/web/orderInfo/{mainOrderId}")
-    public R<WebMainOrdersInfoVO> webOrderInfo (@PathVariable String mainOrderId) {
+    public R<WebMainOrdersInfoVO> webOrderInfo (@PathVariable Long mainOrderId) {
         WebMainOrdersInfoVO webMainOrderInfoVO = mainOrderService.selectWebMainOrderInfoVO(mainOrderId);
         List<SecondOrder> secondOrderList = secondOrderService.list(new LambdaQueryWrapper<SecondOrder>().eq(SecondOrder::getMainOrderId, mainOrderId));
         webMainOrderInfoVO.setSecondOrderList(secondOrderList);

leromro-core/src/main/java/com/leromro/core/controller/volunteerOrderController.java

@@ -68,7 +68,7 @@ public class volunteerOrderController extends BaseController {
 
     @ApiOperation(value = "志愿者滑动，开始订单", notes = "目前只传secondOrderId（第二版再根据地址判断）")
     @GetMapping("/getTimesByDate/{secondOrderId}")
-    public AjaxResult volunteerStartWork(@PathVariable String secondOrderId){
+    public AjaxResult volunteerStartWork(@PathVariable Long secondOrderId){
         UpdateWrapper<SecondOrder> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("second_order_id",secondOrderId).set("order_status","3").set("update_time", DateTimeUtil.getNowTime());
         secondOrderService.update(updateWrapper);

leromro-core/src/main/java/com/leromro/core/domain/MainOrders.java

@@ -36,7 +36,7 @@ public class MainOrders extends BaseEntity
     @ApiModelProperty("订单id")
     @TableField("main_order_id")
     @TableId
-    private String mainOrderId;
+    private Long mainOrderId;
 
     /** 下单用户id */
     @Excel(name = "下单用户id")

leromro-core/src/main/java/com/leromro/core/domain/OrderFrozenFunds.java

@@ -63,7 +63,7 @@ public class OrderFrozenFunds extends BaseEntity
     /** 志愿者订单id */
     @TableField("second_order_id")
     @ApiModelProperty("志愿者订单id")
-    private String secondOrderId;
+    private Long secondOrderId;
 
     /** 志愿者id */
     @TableField("volunteer_id")

leromro-core/src/main/java/com/leromro/core/domain/OrderRefund.java

@@ -37,7 +37,7 @@ public class OrderRefund extends BaseEntity {
      */
     @TableField("main_order_id")
     @ApiModelProperty("主订单号")
-    private String mainOrderId;
+    private Long mainOrderId;
     /**
      * 主订单号
      */

leromro-core/src/main/java/com/leromro/core/domain/PlatformFinance.java

@@ -54,7 +54,7 @@ public class PlatformFinance extends BaseEntity
     /** 志愿者订单id */
     @TableField("second_order_id")
     @ApiModelProperty("志愿者订单id")
-    private String secondOrderId;
+    private Long secondOrderId;
 
     /** 志愿者id */
     @TableField("volunteer_id")

leromro-core/src/main/java/com/leromro/core/domain/SecondOrder.java

@@ -39,12 +39,12 @@ public class SecondOrder extends BaseEntity
     /** 主键 小订单表id */
     @Excel(name = "小订单id")
     @ApiModelProperty("主键 小订单表id")
-    private String secondOrderId;
+    private Long secondOrderId;
 
     /** 订单id */
     @Excel(name = "主订单id")
     @ApiModelProperty("订单id")
-    private String mainOrderId;
+    private Long mainOrderId;
 
     /** 服务单价 */
     @Excel(name = "下单单价")

leromro-core/src/main/java/com/leromro/core/domain/vo/webMainOrderListVO.java

@@ -15,7 +15,7 @@ import java.util.Date;
 public class webMainOrderListVO {
 
     @ApiModelProperty("订单id")
-    private String mainOrderId;
+    private Long mainOrderId;
 
     @ApiModelProperty("单价")
     private BigDecimal serviceOnePrice;

leromro-core/src/main/java/com/leromro/core/mapper/MainOrdersMapper.java

@@ -16,7 +16,7 @@ public interface MainOrdersMapper extends BaseMapper<MainOrders> {
 
     List<webMainOrderListVO> webMainOrderList(MainOrdersVO mainOrdersVO);
 
-    void startService(String secondOrderId);
+    void startService(Long secondOrderId);
 
-    WebMainOrdersInfoVO selectWebMainOrderInfoVO(String mainOrderId);
+    WebMainOrdersInfoVO selectWebMainOrderInfoVO(Long mainOrderId);
 }

leromro-core/src/main/java/com/leromro/core/service/IMainOrderService.java

@@ -20,7 +20,7 @@ public interface IMainOrderService extends IService<MainOrders> {
 
     List<webMainOrderListVO> webMainOrderList(MainOrdersVO mainOrdersVO);
 
-    void startService(String secondOrderId);
+    void startService(Long secondOrderId);
 
-    WebMainOrdersInfoVO selectWebMainOrderInfoVO(String mainOrderId);
+    WebMainOrdersInfoVO selectWebMainOrderInfoVO(Long mainOrderId);
 }

leromro-core/src/main/java/com/leromro/core/service/impl/MainOrderServiceImpl.java

@@ -127,7 +127,7 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
         orders.setDistrictName(address.getDistrictName());
         orders.setDistrictCode(address.getDistrictCode());
 
-        orders.setMainOrderId(String.valueOf(orderId));
+        orders.setMainOrderId(orderId);
         orders.setServiceDuration(info.getBusinessDuration());
         orders.setFinishTimes(0L);
         orders.setUserId(userId);
@@ -143,7 +143,7 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
 
         //创建小订单模板
         //
-        SecondOrder secondOrder = SecondOrder.builder().mainOrderId(String.valueOf(orderId)).volunteerId(orders.getVolunteerId()).
+        SecondOrder secondOrder = SecondOrder.builder().mainOrderId(orderId).volunteerId(orders.getVolunteerId()).
                 serviceCategory(orders.getServiceCategory()).serviceDuration(orders.getServiceDuration()).addressId(orders.getAddressId())
                 .serviceOnePrice(orders.getServiceOnePrice()).volunteerInfoId(orders.getVolunteerInfoId()).orderStatus(seconderStatus)
                 .provinceCode(address.getProvinceCode()).cityCode(address.getCityCode()).districtCode(address.getDistrictCode())
@@ -173,12 +173,12 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
             secondOrder1.setWorkStartTime(workDate.getWorkStartTime());
             secondOrder1.setWorkEndTime(workDate.getWorkStartTime().plus(Duration.ofMinutes(orders.getServiceDuration())));
             secondOrder1.setWorkNumber(number);
-            secondOrder1.setSecondOrderId(String.valueOf(secondOrderIdL));
+            secondOrder1.setSecondOrderId(secondOrderIdL);
             secondOrderList.add(secondOrder1);
             //向平台流水中添加数据
             PlatformFinance platformFinance1 = new PlatformFinance();
             BeanUtils.copyProperties(platformFinance,platformFinance1);
-            platformFinance1.setSecondOrderId(String.valueOf(secondOrderIdL));
+            platformFinance1.setSecondOrderId(secondOrderIdL);
             platformFinanceList.add(platformFinance1);
             //向志愿者预约时间表中添加数据
             int parts = businessDurationMin/30;
@@ -224,7 +224,7 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
      * @param secondOrderId
      */
     @Override
-    public void startService(String secondOrderId) {
+    public void startService(Long secondOrderId) {
         mainOrdersMapper.startService(secondOrderId);
     }
 
@@ -233,7 +233,7 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
      * @return
      */
     @Override
-    public WebMainOrdersInfoVO selectWebMainOrderInfoVO(String mainOrderId) {
+    public WebMainOrdersInfoVO selectWebMainOrderInfoVO(Long mainOrderId) {
         WebMainOrdersInfoVO webMainOrderInfoVO = mainOrdersMapper.selectWebMainOrderInfoVO(mainOrderId);
         return webMainOrderInfoVO;
     }

leromro-core/src/main/java/com/leromro/core/service/impl/OrderRefundServiceImpl.java

@@ -79,7 +79,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
     @Transactional
     public AjaxResult insertLOrderRefund(OrderRefund orderRefund) {
         //如果订单，一次都没完成，那就直接不用审批，直接退。
-        String mainOrderId = orderRefund.getMainOrderId();
+        Long mainOrderId = orderRefund.getMainOrderId();
         //先查订单
         QueryWrapper<MainOrders> mainOrdersQueryWrapper = new QueryWrapper<MainOrders>().eq("main_order_id", mainOrderId);
         MainOrders mainOrders = mainOrdersMapper.selectOne(mainOrdersQueryWrapper);
@@ -209,11 +209,14 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
      */
     @Override
     @Transactional
-    public void checkOrderRefund(OrderRefund orderRefund) {
+    public void checkOrderRefund(OrderRefund orderRefund1) {
         //传状态status ,主订单id，同意退款金额
         //只能单独审核
         //先查订单
-        String mainOrderId = orderRefund.getMainOrderId();
+        OrderRefund orderRefund = lOrderRefundMapper.selectById(orderRefund1.getOrderRefundId());
+        //orderRefund.setStatus(orderRefund1.getStatus());
+
+        Long mainOrderId = orderRefund.getMainOrderId();
         QueryWrapper<MainOrders> mainOrdersQueryWrapper = new QueryWrapper<MainOrders>().eq("main_order_id", mainOrderId);
         MainOrders mainOrders = mainOrdersMapper.selectOne(mainOrdersQueryWrapper);
         if (orderRefund.getStatus().equals("2")){
@@ -223,7 +226,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         //小订单修改状态，并且
         QueryWrapper<SecondOrder> secondOrderQueryWrapper = new QueryWrapper<SecondOrder>().eq("main_order_id", mainOrderId).eq("order_status", 1);
         List<SecondOrder> secondOrderList = secondOrdersMapper.selectList(secondOrderQueryWrapper);
-        List<String> secondOrderIdList = secondOrderList.stream().map(SecondOrder::getSecondOrderId).collect(Collectors.toList());
+        List<Long> secondOrderIdList = secondOrderList.stream().map(SecondOrder::getSecondOrderId).collect(Collectors.toList());
         UpdateWrapper<SecondOrder> secondOrderUpdateWrapper = new UpdateWrapper<SecondOrder>().in("second_order_id", secondOrderIdList).eq("order_status", 1).set("order_status", 6);
         secondOrdersMapper.update(null, secondOrderUpdateWrapper);
         //根据小订单，删除志愿者预约时间表

leromro-core/src/main/java/com/leromro/core/service/impl/SecondOrdersServiceImpl.java

@@ -54,7 +54,7 @@ public class SecondOrdersServiceImpl extends ServiceImpl<SecondOrdersMapper, Sec
     @Override
     public AjaxResult volunteerFinishWork(SecondOrder secondOrder) {
 
-        String secondOrderId = secondOrder.getSecondOrderId();
+        Long secondOrderId = secondOrder.getSecondOrderId();
         QueryWrapper<SecondOrder> SecondOrderWrapper = new QueryWrapper<SecondOrder>().eq("second_order_id", secondOrderId);
         SecondOrder secondOrderInfo = secondOrdersMapper.selectList(SecondOrderWrapper).get(0);
        // SecondOrder secondOrderInfo = secondOrdersMapper.selectById(secondOrderId);
@@ -89,7 +89,7 @@ public class SecondOrdersServiceImpl extends ServiceImpl<SecondOrdersMapper, Sec
         volunteerAccount.setUpdateTime(DateTimeUtil.getNowTime());
         volunteerAccountMapper.updateById(volunteerAccount);
         //判断是否完单
-        String mainOrderId = secondOrderInfo.getMainOrderId();
+        Long mainOrderId = secondOrderInfo.getMainOrderId();
         QueryWrapper<MainOrders> mainOrdersQueryWrapper = new QueryWrapper<MainOrders>().eq("main_order_id", mainOrderId);
         Long totalTimes = mainOrdersMapper.selectList(mainOrdersQueryWrapper).get(0).getTotalTimes();
         UpdateWrapper<MainOrders> mainOrdersUpdateWrapper = new UpdateWrapper<MainOrders>().eq("main_order_id", mainOrderId).setSql("finish_times = finish_times + 1");

leromro-core/src/main/java/com/leromro/core/ttl/Monitor.java

@@ -41,7 +41,7 @@ public class Monitor  {
             return;
         }
         List<Long> orderFrozenFundsIdList = needThawMoneyList.stream().map(OrderFrozenFunds::getOrderFrozenFundsId).collect(Collectors.toList());
-        List<String> seconderOrderIdList = needThawMoneyList.stream().map(OrderFrozenFunds::getSecondOrderId).collect(Collectors.toList());
+        List<Long> seconderOrderIdList = needThawMoneyList.stream().map(OrderFrozenFunds::getSecondOrderId).collect(Collectors.toList());
 
         // needThawMoneyList.stream().map(OrderFrozenFunds::).collect(Collectors.toList());
         //Map<Long, OrderFrozenFunds> totalMoneyMap = needThawMoneyList.stream().collect(Collectors.toMap(OrderFrozenFunds::getVolunteerId, Function.identity()));

leromro-core/src/main/resources/mapper/core/OrderRefundMapper.xml

@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from l_main_orders lmo
         left join l_order_refund lor on lmo.main_order_id = lor.main_order_id
         <where>
-            lmo.order_status = '5'
+            lmo.order_status = '5' or lmo.order_status ='6' or lmo.order_status ='7'
             <if test="clientName != null and clientName != ''">and lmo.client_name = #{clientName}</if>
             <if test="clientTelephone != null and clientTelephone != ''">and lmo.clien_telephone = #{clientTelephone}</if>
             <if test="businessManagementId != null and businessManagementId != ''">and lmo.business_management_id = #{businessManagementId}</if>