Merge remote-tracking branch 'origin/main'

internal/logic/order/returnPlant.go

@@ -29,7 +29,7 @@ func SaveOrUpdateReturnPlant(ctx context.Context, orderCode string, orderMoney i
 			if code == "合计" {
 				checkMoney = money
 			} else {
-				totalMoney = +money
+				totalMoney += money
 			}
 		}
 		if totalMoney != checkMoney || orderMoney != checkMoney {

internal/logic/product/bigmember/bigcommon.go

@@ -32,13 +32,14 @@ const (
 func ExistProcessOrder(phone, orderCode string) bool {
 	sql := fmt.Sprintf(`SELECT count(1) FROM dataexport_order a
 INNER JOIN jy_order_detail b on a.order_code = b.order_code 
-WHERE  a.phone = '%s' and b.is_service_open = 0 and b.product_type = '大会员' `, phone)
+WHERE  a.user_phone = '%s' and b.is_service_open = 0 and b.product_type = '大会员' `, phone)
 	if orderCode != "" {
 		sql += fmt.Sprintf(" and b.order_code != '%s'", orderCode)
 	}
 	count, err := g.DB().Ctx(context.Background()).GetCount(context.Background(), sql)
-	if err == nil {
+	if err != nil {
 		log.Println("ExistProcessOrder err:", err.Error())
+		return true
 	}
 	return count > 0
 }

internal/logic/product/bigmember/bigmember.go

@@ -27,7 +27,7 @@ type (
 )
 
 func init() {
-	product.JyProFunc.RegisterJyProductCreateFunc("bigmember", NewBigProduct)
+	product.JyProFunc.RegisterJyProductCreateFunc("dyh", NewBigProduct)
 }
 
 func NewBigProduct(reqParam map[string]interface{}, detailId ...int64) (product.JyProduct, error) {
@@ -52,7 +52,7 @@ func NewBigProduct(reqParam map[string]interface{}, detailId ...int64) (product.
 func (p jyBigProduct) Check(ctx context.Context, t int) error {
 	switch p.param.ReqSubject {
 	case 1:
-		if !ExistProcessOrder(p.param.Phone, p.param.OrderCode) { //校验是否存在未开通的权益
+		if ExistProcessOrder(p.param.Phone, p.param.OrderCode) { //校验是否存在未开通的权益
 			return errors.New("个人身份存在未生效的产品订单")
 		}
 		//个人身份购买情况是否已有权益
@@ -116,6 +116,9 @@ func (p jyBigProduct) Check(ctx context.Context, t int) error {
 	if p.param.Phone == "" {
 		return errors.New("缺少开通手机号")
 	}
+	if (p.param.ServiceType == Try || p.param.ServiceType == Buy) && p.param.Filter.ComboId == 0 && len(p.param.Filter.ServiceIds) == 0 {
+		return errors.New("自定义服务获取失败")
+	}
 
 	if !(p.param.ServiceType == Try || p.param.ServiceType == Renew || p.param.ServiceType == Upgrades || p.param.ServiceType == Buy) {
 		return errors.New("未知商品支付操作")
@@ -133,7 +136,6 @@ func (p jyBigProduct) Check(ctx context.Context, t int) error {
 		if !(p.param.Tactics == 1 || p.param.Tactics == 2) {
 			return fmt.Errorf("参数异常")
 		}
-
 		productItem, err := service.Product().GetProduct(p.param.ProductCode)
 		if err != nil {
 			return errors.New("未知商品")
@@ -167,7 +169,7 @@ func (p jyBigProduct) SaveUpdate(ctx context.Context, masterKey string) error {
 			"final_price":      p.param.Amount,
 			"order_detail_id":  p.param.ProductCode,
 			"tactics":          p.param.Tactics,
-			"linked_detail_id": p.param.LinkedOrderId,
+			"linked_detail_id": gconv.Int(p.param.LinkedOrderId),
 			"is_master":        common.If(fmt.Sprintf("%s_%d", p.param.ProductCode, p.param.Amount) == masterKey, 1, 0),
 		}
 

internal/logic/product/bigmember/price.go

@@ -60,7 +60,7 @@ func (p jyBigProduct) GetPrice() (price int64, err error) {
 				diyPrice, specialPrice int64
 				basicService           bool
 			)
-			serData, _ := g.DB().Query(context.Background(), fmt.Sprintf(`SELECT id,i_class,s_new_name FROM bigmember_service WHERE i_class> 0 and   id in ('%s')`, strings.Join(p.param.Filter.ServiceIds, `','`)))
+			serData, _ := g.DB().Query(context.Background(), fmt.Sprintf(`SELECT id,i_class,s_new_name,i_price_year FROM bigmember_service WHERE i_class> 0 and   id in ('%s')`, strings.Join(p.param.Filter.ServiceIds, `','`)))
 			if !serData.IsEmpty() {
 				for _, m := range serData.List() {
 					if gconv.Int(m["i_class"]) == 1 && !basicService {
@@ -114,7 +114,7 @@ func (p jyBigProduct) GetPrice() (price int64, err error) {
 					}
 				}
 				if len(supService) > 0 {
-					serData, _ := g.DB().Query(context.Background(), fmt.Sprintf(`SELECT id,i_class,s_new_name FROM bigmember_service WHERE i_class> 0 and   id in ('%s')`, strings.Join(supService, `','`)))
+					serData, _ := g.DB().Query(context.Background(), fmt.Sprintf(`SELECT id,i_class,s_new_name,i_price_year FROM bigmember_service WHERE i_class> 0 and   id in ('%s')`, strings.Join(supService, `','`)))
 					if !serData.IsEmpty() {
 						for _, m := range serData.List() {
 							if gconv.Int(m["i_class"]) == 1 && !basicService {

internal/model/orderParams.go

@@ -85,15 +85,15 @@ type (
 
 	// ReturnPlant 回款计划
 	ReturnPlant struct {
-		DayNum     int                 `json:"day_num" doc:"回款工作日"`
-		ExpectTime string              `json:"expect_time" doc:"预计回款时间"`
-		PlantList  []map[string]string `json:"plant_list" doc:"多次回款计划"`
+		DayNum     int                      `json:"day_num" doc:"回款工作日"`
+		ExpectTime string                   `json:"expect_time" doc:"预计回款时间"`
+		PlantList  []map[string]interface{} `json:"plant_list" doc:"多次回款计划"`
 	}
 
 	OrdersExamine struct { //审批
 		OrderCode string `json:"orderCode"`
-		State     int    `json:"state"`  //审核状态
-		Reason    string `json:"reason"` //备注
+		State     int    `json:"state"`            //审核状态
+		Reason    string `json:"reason,omitempty"` //备注
 	}
 
 	OrdersEditBatchReturn struct { //回款