From df2fccef0684a597872df8666db91349126f920b Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 12 Sep 2022 14:48:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=92=E7=BB=9D=E6=8E=A5=E5=8D=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=EF=BC=8C=E8=AE=A2=E5=8D=95=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/order/OrderController.java |  9 +++-
 .../order/OrderDetailController.java          | 14 ++++++
 .../ghy/order/mapper/OrderDetailMapper.java   |  2 +
 .../ghy/order/mapper/OrderGoodsMapper.java    |  2 +
 .../ghy/order/service/OrderDetailService.java |  2 +
 .../ghy/order/service/OrderGoodsService.java  |  2 +
 .../service/impl/OrderDetailServiceImpl.java  |  5 ++
 .../service/impl/OrderGoodsServiceImpl.java   |  5 ++
 .../mapper/order/OrderDetailMapper.xml        | 50 +++++++++++++++++++
 .../mapper/order/OrderGoodsMapper.xml         |  9 ++++
 .../mapper/order/OrderMasterMapper.xml        |  3 ++
 .../payment/mapper/FinancialDetailMapper.java |  4 +-
 .../service/FinancialDetailService.java       |  1 +
 .../impl/FinancialDetailServiceImpl.java      | 16 +++++-
 .../financial/FinancialDetailMapper.xml       | 10 ++--
 15 files changed, 127 insertions(+), 7 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 62174aa3..e401e5a4 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -236,7 +236,7 @@ public class OrderController extends BaseController {
         // 如果派单师傅的抽成金额>0 则为派单师傅生成子财务单
         if (BigDecimal.ZERO.compareTo(assignWorkerMoney) < 0) {
             FinancialDetail fd = new FinancialDetail(fm.getDeptId(), financialDetailService.createCode(), fm.getId(),
-                    fm.getCode(), null, null, assignWorkerMoney, FinancialDetailType.WORKER_FEE.getCode(), assignWorker.getWorkerId(),
+                    fm.getCode(), od.getId(), od.getCode(), assignWorkerMoney, FinancialDetailType.WORKER_FEE.getCode(), assignWorker.getWorkerId(),
                     fm.getPayType(), fm.getPayStatus(), fm.getPayTime());
             financialDetailService.insertFinancialDetail(fd);
         }
@@ -417,8 +417,13 @@ public class OrderController extends BaseController {
             OrderMaster orderMaster = new OrderMaster();
             orderMaster.setOrderStatus(OrderStatus.RECEIVE.code());
             orderMaster.setWorkerId(request.getWorkerId());
+            OrderDetail orderDetail = new OrderDetail();
+            orderDetail.setOrderStatus(OrderStatus.RECEIVE.code());
+            orderDetail.setWorkerId(request.getWorkerId());
+            Long newMasterOrderCount = orderMasterService.countOrderMasterList(orderMaster);
+            Long newDetailOrderCount = orderDetailService.countOrderDetailList(orderDetail);
             // 统计新订单的单量
-            response.setNewOrderNum(orderMasterService.countOrderMasterList(orderMaster));
+            response.setNewOrderNum(newMasterOrderCount + newDetailOrderCount);
             // 统计未排的单量
             orderMaster.setOrderStatus(OrderStatus.PLAIN.code());
             response.setPlanOrderNum(orderMasterService.countOrderMasterList(orderMaster));
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index 03b4c5f1..d50d2e5b 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -423,4 +423,18 @@ public class OrderDetailController extends BaseController {
 
         return AjaxResult.success("发起成功");
     }
+
+    @PostMapping("/app/order/reject")
+    @ResponseBody
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult rejectDetailOrder(@RequestBody OrderDetail orderDetail) {
+        // 删除子单
+        orderDetailService.deleteOrderDetailByIds(orderDetail.getId().toString());
+        // 删除子财务单
+        financialDetailService.deleteFinancialDetailByOrderDetailId(orderDetail.getId());
+        // 删除派单记录
+        orderGoodsService.deleteByOrderDetailId(orderDetail.getId());
+
+        return AjaxResult.success();
+    }
 }
diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java
index 1d482c97..b366a518 100644
--- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java
+++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java
@@ -31,6 +31,8 @@ public interface OrderDetailMapper {
      */
     List<OrderDetail> selectOrderDetailList(OrderDetail orderDetail);
 
+    Long countOrderDetailList(OrderDetail orderDetail);
+
     /**
      * @param orderDetailId 细单表id
      * @return 细单表
diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderGoodsMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderGoodsMapper.java
index 8a83e08e..591d465e 100644
--- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderGoodsMapper.java
+++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderGoodsMapper.java
@@ -37,6 +37,8 @@ public interface OrderGoodsMapper {
 
     List<OrderGoods> selectByOrderDetailId(@Param("orderDetailId") Long orderDetailId);
 
+    int deleteByOrderDetailId(@Param("orderDetailId") Long orderDetailId);
+
     /**
      * 批量删除订单商品信息
      *
diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java
index ace75d2c..07d8241a 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java
@@ -108,4 +108,6 @@ public interface OrderDetailService {
      * @param orderDetailId 子订单ID
      */
     void finish(Long orderDetailId) throws BaseAdaPayException;
+
+    Long countOrderDetailList(OrderDetail orderDetail);
 }
diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderGoodsService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderGoodsService.java
index 06423d77..f79785c4 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/OrderGoodsService.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/OrderGoodsService.java
@@ -52,4 +52,6 @@ public interface OrderGoodsService {
      * @return 键值队列数据， key-> 订单Id value-> 订单实体集合信息
      */
     Map<Long, List<OrderGoods>> byOrderIdInMap(List<Long> orderIdList);
+
+    int deleteByOrderDetailId(Long orderDetailId);
 }
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
index 9e5f0050..fec18416 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
@@ -348,4 +348,9 @@ public class OrderDetailServiceImpl implements OrderDetailService {
             }
         }));
     }
+
+    @Override
+    public Long countOrderDetailList(OrderDetail orderDetail) {
+        return orderDetailMapper.countOrderDetailList(orderDetail);
+    }
 }
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java
index 515659de..6a85372e 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java
@@ -79,4 +79,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         }
         return longByOrderGoodsListMap;
     }
+
+    @Override
+    public int deleteByOrderDetailId(Long orderDetailId) {
+        return orderGoodsMapper.deleteByOrderDetailId(orderDetailId);
+    }
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index 4d023801..41f8fad6 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -119,6 +119,56 @@
         </trim>
     </select>
 
+    <select id="countOrderDetailList" parameterType="com.ghy.order.domain.OrderDetail" resultType="Long">
+        SELECT COUNT(*) FROM order_detail od
+        <where>
+            <if test="code != null and code != ''">
+                AND od.code LIKE concat('%', #{code}, '%')
+            </if>
+            <if test="customerId != null and customerId != 0">
+                AND od.customer_id = #{customerId}
+            </if>
+            <if test="orderType != null">
+                AND od.order_type = #{orderType}
+            </if>
+            <if test="orderStatus != null">
+                AND od.order_status = #{orderStatus}
+            </if>
+            <if test="orderMasterCode != null and orderMasterCode != 0">
+                AND od.order_detail_code = #{orderMasterCode}
+            </if>
+            <if test="workerId != null and workerId != 0">
+                AND od.worker_id = #{workerId}
+            </if>
+            <if test="goodsCategoryId != null">
+                AND g.dept_goods_category_id = #{goodsCategoryId}
+            </if>
+            <if test="goodsName != null and goodsName != ''">
+                AND g.goods_name like concat('%', #{goodsName}, '%')
+            </if>
+            <if test="countryId != null">
+                AND ca.country_id = #{countryId}
+            </if>
+            <if test="expectTimeStart != null">
+                AND od.expect_time_start &gt;= #{expectTimeStart}
+            </if>
+            <if test="expectTimeEnd != null">
+                AND od.expect_time_end &lt;= #{expectTimeEnd}
+            </if>
+        </where>
+        order by od.create_time
+        <trim suffixOverrides=",">
+            <choose>
+                <when test="params.createTimeSort != null and params.createTimeSort != ''">
+                    ${params.createTimeSort}
+                </when>
+                <otherwise>
+                    desc
+                </otherwise>
+            </choose>
+        </trim>
+    </select>
+
     <select id="selectById" parameterType="long" resultMap="OrderDetailResult">
         <include refid="selectOrderDetail"/> WHERE id = #{orderDetailId}
     </select>
diff --git a/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
index 50191d83..1fe69f83 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
@@ -108,6 +108,15 @@
         </where>
     </select>
 
+    <delete id="deleteByOrderDetailId" parameterType="Long">
+        DELETE FROM order_goods
+        <where>
+            <if test="orderDetailId != null and orderDetailId != 0">
+                AND order_detail_id = #{orderDetailId}
+            </if>
+        </where>
+    </delete>
+
     <delete id="deleteOrderGoodsByIds" parameterType="Long">
         DELETE FROM order_goods WHERE order_goods_id IN
         <foreach collection="array" item="orderGoodsId" open="(" separator="," close=")">
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 8deb433c..f26a5d3d 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -195,6 +195,9 @@
             <if test="payType != null">pay_type = #{payType},</if>
             <if test="payStatus != null">pay_status = #{payStatus},</if>
             <if test="workerId != null and workerId != 0">worker_id = #{workerId},</if>
+            <if test="workerId == -1">
+                worker_id = NULL,
+            </if>
             <if test="payTime != null">pay_time = #{payTime},</if>
             <if test="revTime != null">rev_time = #{revTime},</if>
             <if test="expectTimeStart != null">expect_time_start = #{expectTimeStart},</if>
diff --git a/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java b/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java
index a067c567..40112ef8 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialDetailMapper.java
@@ -62,6 +62,8 @@ public interface FinancialDetailMapper {
      */
     int deleteFinancialDetailByIds(Long[] financialDetailIds);
 
+    int deleteFinancialDetailByOrderDetailId(Long orderDetailId);
+
     /**
      * @param financialDetailCode 财务细单编码
      * @return 财务细单信息
@@ -90,4 +92,4 @@ public interface FinancialDetailMapper {
      * @param financialDetail 子财务单
      */
     void updateByFinancialMasterId(FinancialDetail financialDetail);
-}
\ No newline at end of file
+}
diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java
index 3be3713f..41a072b3 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java
@@ -62,6 +62,7 @@ public interface FinancialDetailService {
      */
     int deleteFinancialDetailByIds(String ids);
 
+    int deleteFinancialDetailByOrderDetailId(Long orderDetailId);
     /**
      * 校验财务细单编码是否重复
      *
diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java
index ec2c64f3..61fe295e 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java
@@ -2,11 +2,13 @@ package com.ghy.payment.service.impl;
 
 import com.ghy.common.constant.UserConstants;
 import com.ghy.common.core.text.Convert;
+import com.ghy.common.enums.FinancialDetailType;
 import com.ghy.payment.domain.FinancialDetail;
 import com.ghy.payment.mapper.FinancialDetailMapper;
 import com.ghy.payment.response.FinancialCountResponse;
 import com.ghy.payment.service.FinancialDetailService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
@@ -58,7 +60,14 @@ public class FinancialDetailServiceImpl implements FinancialDetailService {
 
     @Override
     public FinancialDetail selectByOrderDetailId(Long orderDetailId) {
-        return financialDetailMapper.selectByOrderDetailId(orderDetailId);
+        FinancialDetail financialDetail = new FinancialDetail();
+        financialDetail.setOrderDetailId(orderDetailId);
+        financialDetail.setFinancialDetailType(FinancialDetailType.ORDER_FEE.getCode());
+        List<FinancialDetail> list = financialDetailMapper.selectFinancialDetailList(financialDetail);
+        if (!CollectionUtils.isEmpty(list)) {
+            return list.get(0);
+        }
+        return null;
     }
 
     @Override
@@ -92,6 +101,11 @@ public class FinancialDetailServiceImpl implements FinancialDetailService {
         return financialDetailMapper.deleteFinancialDetailByIds(financialDetailIds);
     }
 
+    @Override
+    public int deleteFinancialDetailByOrderDetailId(Long orderDetailId) {
+        return financialDetailMapper.deleteFinancialDetailByOrderDetailId(orderDetailId);
+    }
+
     @Override
     public String checkFinancialDetailCodeUnique(FinancialDetail financialDetail) {
         long financialDetailId = financialDetail.getId() == null ? -1L : financialDetail.getId();
diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml
index 7baa294c..3efe8ecd 100644
--- a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml
+++ b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml
@@ -27,7 +27,7 @@
         <result property="updateTime"            column="update_time"/>
         <result property="remark"                column="remark"/>
     </resultMap>
-    
+
     <resultMap id="countResult" type="com.ghy.payment.response.FinancialCountResponse">
         <result property="createTime"                column="create_time"/>
         <result property="payCount"                column="pay_count"/>
@@ -90,6 +90,10 @@
         </foreach>
     </delete>
 
+    <delete id="deleteFinancialDetailByOrderDetailId" parameterType="Long">
+        DELETE FROM financial_detail WHERE order_detail_id = #{orderDetailId}
+    </delete>
+
     <update id="updateFinancialDetail" parameterType="com.ghy.payment.domain.FinancialDetail">
         UPDATE financial_detail
         <set>
@@ -145,7 +149,7 @@
         </where>
         group by DATE_FORMAT(create_time,'%Y-%m') order by create_time desc
     </select>
-    
+
     <insert id="insertFinancialDetail" parameterType="com.ghy.payment.domain.FinancialDetail" useGeneratedKeys="true"
             keyProperty="id">
         INSERT INTO financial_detail(
@@ -202,4 +206,4 @@
         </where>
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>