新增了药品订单取消增加order表取消。新增了服务包订单取消关联问诊订单取消

api/service/orderProduct.go

@@ -233,6 +233,19 @@ func (r *OrderProductService) CancelOrderProduct(req requests.CancelOrderProduct
 		}
 	}
 
+	// 修改订单为取消
+	orderData := make(map[string]interface{})
+	orderData["cancel_status"] = 1
+	orderData["cancel_time"] = time.Now().Format("2006-01-02 15:04:05")
+	orderData["cancel_remarks"] = req.CancelRemarks
+
+	orderDao := dao.OrderDao{}
+	err = orderDao.EditOrderById(tx, orderProduct.OrderId, orderData)
+	if err != nil {
+		tx.Rollback()
+		return false, errors.New("取消订单失败")
+	}
+
 	// 修改问诊订单退款状态
 	orderProductData["refund_status"] = refundStatus
 	orderProductData["order_product_status"] = 5                               // 订单状态（1:待支付 2:待发货 3:已发货 4:已签收 5:已取消）
@@ -246,6 +259,29 @@ func (r *OrderProductService) CancelOrderProduct(req requests.CancelOrderProduct
 		return false, errors.New("取消订单失败")
 	}
 
+	// 新增退款表
+	orderRefund := &model.OrderRefund{
+		OrderId:      orderProduct.OrderId,
+		PatientId:    orderProduct.PatientId,
+		OrderNo:      orderProduct.OrderProductNo,
+		RefundNo:     refundNo,
+		RefundId:     refundId,
+		RefundStatus: refundStatus,
+		RefundTotal:  orderProduct.PaymentAmountTotal,
+		RefundReason: req.CancelRemarks,
+	}
+
+	if refundStatus == 3 && !successTime.IsZero() {
+		orderRefund.SuccessTime = model.LocalTime(successTime)
+	}
+
+	orderRefundDao := dao.OrderRefundDao{}
+	orderRefund, err = orderRefundDao.AddOrderRefund(tx, orderRefund)
+	if err != nil || orderRefund == nil {
+		tx.Rollback()
+		return false, errors.New(err.Error())
+	}
+
 	// 新增退款表
 	orderProductRefund := &model.OrderProductRefund{
 		PatientId:           orderProduct.PatientId,
@@ -256,7 +292,10 @@ func (r *OrderProductService) CancelOrderProduct(req requests.CancelOrderProduct
 		ProductRefundStatus: refundStatus,
 		RefundTotal:         orderProduct.PaymentAmountTotal,
 		RefundReason:        req.CancelRemarks,
-		SuccessTime:         model.LocalTime(successTime),
+	}
+
+	if refundStatus == 3 && !successTime.IsZero() {
+		orderProductRefund.SuccessTime = model.LocalTime(successTime)
 	}
 
 	orderProductRefundDao := dao.OrderProductRefundDao{}