fix:红冲调整

internal/logic/order/examine.go

@@ -130,7 +130,7 @@ func OrdersExamine(ctx context.Context, param model.OrdersExamine) error {
 		}
 		if newAuditStatus == 3 {
 			//“协议归档状态”如若为“已归档”，则“订单状态”更新为“已完成”，如若为“未归档”，则订单状态仍为“未完成”
-			contractData, err := g.DB().Ctx(ctx).GetOne(ctx, "contract", fmt.Sprintf(`SELECT contract_archive_status,contract_archive_time FROM contract where order_code = '%s'`, param.OrderCode))
+			contractData, err := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf(`SELECT contract_archive_status,contract_archive_time FROM contract where order_code = '%s'`, param.OrderCode))
 			if err == nil && !contractData.IsEmpty() {
 				if common.IntAll(contractData.Map()["contract_archive_status"]) == 1 {
 					upData["order_status"] = 1

internal/logic/order/uploadContractFile.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/gogf/gf/v2/frame/g"
+	"jyOrderManager/internal/jyutil"
 	"jyOrderManager/internal/model"
 	"log"
 )
@@ -29,7 +30,17 @@ func UploadContractFile(ctx context.Context, param model.UploadContract) error {
 	}
 	if err != nil {
 		log.Println("UploadContractFile err ", err.Error())
+		return err
+	}
+	//判断是否增加业绩变更
+	if common.IntAll(orderData.Map()["pay_money"]) > 0 && common.IntAll(orderData.Map()["is_backstage_order"]) == 1 &&
+		common.IntAll(orderData.Map()["order_status"]) == 0 && common.IntAll(orderData.Map()["return_status"]) == 0 {
+		_ = CommonChange(ctx, param.OrderCode, param.ContractArchiveTime, ReturnProtocol)
+		jyutil.MG.DB().Update("dataexport_order", map[string]interface{}{
+			"order_code": param.OrderCode,
+		}, map[string]interface{}{"order_status": 1}, false, false)
 	}
+
 	return err
 }
 

internal/logic/product/otherProduct/price.go

@@ -139,7 +139,7 @@ func (p jyOtherProduct) GetPrice() (int64, error) { //查询价格
 			return -1, gerror.NewCode(gcode.CodeValidationFailed, "价格格式配置异常")
 		}
 		if sps.Price > -1 {
-			return sps.Price, nil
+			return sps.Price * p.SimpleProduct.Filter.Num, nil
 		}
 		return -1, nil
 	}

internal/logic/user/getService.go

@@ -374,7 +374,7 @@ func SpecialService(ctx context.Context, phone, productType string, buySubject i
 
 	orderData, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT jod.service_endtime,jod.id,jod.service_starttime,jod.service_type,jod.order_code,dor.create_time FROM dataexport_order dor 
 INNER JOIN jy_order_detail jod on dor.order_code = jod.order_code 
-WHERE %s and %s ORDER BY dor.create_time desc `, phone, productType))
+WHERE %s and dor.product_type = '%s' ORDER BY dor.create_time desc `, phone, productType))
 	if !orderData.IsEmpty() {
 		for _, m2 := range orderData.List() {
 			if linkedId == 0 {