update 财务添加订单

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SellOrderDao.java

@@ -13,6 +13,15 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
     int batchInsert(@Param("sellOrders") List<SellOrder> sellOrders);
 
     /**
+     * 获取订单的销售列表
+     *
+     * @param orderId
+     * @return
+     */
+    List<SellOrder> getOrderSellOrder(@Param("orderId") Long orderId);
+
+
+    /**
      * 获取分部学校的收入支出(乐团订单)
      *
      * @param startTime
@@ -59,9 +68,17 @@ public interface SellOrderDao extends BaseDAO<Integer, SellOrder> {
 
     /**
      * 维修单和商品销售
+     *
      * @param startTime
      * @param endTime
      * @return
      */
     List<OperatingReport> getRepairGoodsSellGroupMonthReport(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+    /**
+     * 根据订单号删除
+     * @param orderId
+     * @return
+     */
+    int deleteByOrderId(@Param("orderId") Long orderId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentRouteOrderDao.java

@@ -44,4 +44,12 @@ public interface StudentPaymentRouteOrderDao extends BaseDAO<Long, StudentPaymen
     );
 
     List<StudentPaymentOrderExportDto> ExportQueryPage(Map<String, Object> params);
+
+    /**
+     * 根据订单号删除
+     *
+     * @param orderNo
+     * @return
+     */
+    Boolean deleteByOrderNo(@Param("orderNo") String orderNo);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/OutOrderInfoDto.java

@@ -0,0 +1,19 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.SellOrder;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+
+import java.util.List;
+
+public class OutOrderInfoDto extends StudentPaymentOrder {
+
+    private List<SellOrder> sellOrders;
+
+    public List<SellOrder> getSellOrders() {
+        return sellOrders;
+    }
+
+    public void setSellOrders(List<SellOrder> sellOrders) {
+        this.sellOrders = sellOrders;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentRouteOrderService.java

@@ -30,4 +30,11 @@ public interface StudentPaymentRouteOrderService extends BaseService<Long, Stude
 	 */
 	StudentPaymentRouteOrder addRouteOrder(String orderNo,Integer routeOrganId, BigDecimal routeAmount);
 
+	/**
+	 * 删除外部添加的订单
+	 * @param orderId
+	 * @return
+	 */
+	Boolean deleteRouteOrder(Long orderId);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dto.PageInfoOrder;
 import com.ym.mec.biz.dal.dto.StudentPaymentRouteOrderDto;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.SellOrder;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
@@ -169,4 +170,17 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
         return studentPaymentRouteOrder;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteRouteOrder(Long orderId) {
+        StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.get(orderId);
+        if (studentPaymentOrder == null) {
+            throw new BizException("订单不存在,请核查");
+        }
+        studentPaymentOrderDao.delete(orderId);
+        studentPaymentRouteOrderDao.deleteByOrderNo(studentPaymentOrder.getOrderNo());
+        sellOrderDao.deleteByOrderId(orderId);
+        return true;
+    }
+
 }

mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -290,4 +290,13 @@
           AND spo.create_time_ <= #{endTime}
         GROUP BY spo.organ_id_
         ]]></select>
+
+    <!-- 获取订单的销售列表 -->
+    <select id="getOrderSellOrder" resultMap="SellOrder">
+        SELECT * FROM sell_order WHERE order_id_ = #{orderId}
+    </select>
+
+    <delete id="deleteByOrderId">
+        DELETE FROM sell_order WHERE order_id_=#{orderId}
+    </delete>
 </mapper>

mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -209,4 +209,9 @@
         ORDER BY spo.id_ ASC
     </select>
 
+    <delete id="deleteByOrderNo">
+        DELETE FROM student_payment_route_order
+        where order_no_ = #{orderNo}
+    </delete>
+
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentRouteOrderController.java

@@ -3,14 +3,17 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.SellOrderDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.OutOrderInfoDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentRouteOrderDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.page.SporadicOrderQueryInfo;
 import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
+import com.ym.mec.biz.service.SellOrderService;
 import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.biz.service.StudentPaymentRouteOrderService;
@@ -44,6 +47,8 @@ public class StudentPaymentRouteOrderController extends BaseController {
     private EmployeeDao employeeDao;
     @Autowired
     private StudentPaymentOrderDao studentPaymentOrderDao;
+    @Autowired
+    private SellOrderDao sellOrderDao;
 
     @ApiOperation(value = "财务订单列表")
     @GetMapping("/finance")
@@ -92,5 +97,19 @@ public class StudentPaymentRouteOrderController extends BaseController {
         return succeed(studentPaymentRouteOrderService.addOutOrder(studentPaymentRouteOrderDto));
     }
 
+    @ApiOperation(value = "获取订单信息")
+    @GetMapping("/getOrderInfo")
+    @PreAuthorize("@pcs.hasPermissions('routeOrder/getOrderInfo')")
+    public HttpResponseResult<OutOrderInfoDto> add(Long orderId) {
+        OutOrderInfoDto outOrderInfoDto = (OutOrderInfoDto) studentPaymentOrderDao.get(orderId);
+        outOrderInfoDto.setSellOrders(sellOrderDao.getOrderSellOrder(orderId));
+        return succeed(outOrderInfoDto);
+    }
 
+    @ApiOperation(value = "获取订单信息")
+    @PostMapping("/delete")
+    @PreAuthorize("@pcs.hasPermissions('routeOrder/delete')")
+    public HttpResponseResult<Boolean> delete(Long orderId) {
+        return succeed(studentPaymentRouteOrderService.deleteRouteOrder(orderId));
+    }
 }