Browse Source

fix:修改

duxin 3 tháng trước cách đây
mục cha
commit
f11f23196c

+ 1 - 0
internal/cmd/cmd.go

@@ -69,6 +69,7 @@ var (
 					orderGroup.POST("/vipGives", controller.OrderVipGives)                     //获取VIP订阅赠品配置
 					orderGroup.POST("/vipGives", controller.OrderVipGives)                     //获取VIP订阅赠品配置
 					orderGroup.POST("/findUserAccount", controller.FindUserAccount)            //代用户下单创建账号
 					orderGroup.POST("/findUserAccount", controller.FindUserAccount)            //代用户下单创建账号
 					orderGroup.POST("/transferAccounts", controller.TransferAccounts)          //对公转行审核
 					orderGroup.POST("/transferAccounts", controller.TransferAccounts)          //对公转行审核
+					orderGroup.POST("/serviceOpen", controller.TransferAccounts)               //对公转行审核
 
 
 					orderGroup.POST("/createQRCode", controller.CreateQRCode)       //二维码
 					orderGroup.POST("/createQRCode", controller.CreateQRCode)       //二维码
 					orderGroup.POST("/openInvoiceInfo", controller.OpenInvoiceInfo) //开发票
 					orderGroup.POST("/openInvoiceInfo", controller.OpenInvoiceInfo) //开发票

+ 31 - 0
internal/controller/orderServiceOpen.go

@@ -0,0 +1,31 @@
+package controller
+
+import (
+	. "app.yhyue.com/moapp/jybase/api"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/pkg/errors"
+	"jyOrderManager/internal/logic/order"
+	"jyOrderManager/internal/model"
+)
+
+// OrderServiceOpen 服务开通
+func OrderServiceOpen(r *ghttp.Request) {
+	err := func() error {
+		var param model.OrderOpenServiceParams
+		err := gconv.Struct(r.GetBody(), &param)
+		if err != nil {
+			return errors.Wrap(err, "数据校验异常")
+		}
+		err = order.ServiceOpen(r.Context(), param)
+		if err != nil {
+			return errors.Wrap(err, "订单list异常")
+		}
+		return err
+	}()
+	if err != nil {
+		g.Log().Errorf(r.Context(), "订单list异常 %v", err)
+	}
+	r.Response.WriteJson(NewResult(nil, err))
+}

+ 1 - 1
internal/logic/order/detail.go

@@ -327,7 +327,7 @@ WHERE rr.order_code =%s`, param.OrderCode))
 	var saleData = map[string]interface{}{
 	var saleData = map[string]interface{}{
 		"saleEdit": SaleChangePower, //销售业绩变更展示
 		"saleEdit": SaleChangePower, //销售业绩变更展示
 	}
 	}
-	saleRes, _ := g.DB().Query(ctx, fmt.Sprintf("SELECT d.*,(select a.item_name AS order_parent_name from dict_item a where  a.item_code=d.order_channel ) AS order_channel_new FROM order_sale_record d WHERE d.ordercode='%s' and d.state in (1,-1,2) order by d.create_time asc", param.OrderCode))
+	saleRes, _ := g.DB().Query(ctx, fmt.Sprintf("SELECT d.*,(select a.item_name AS order_parent_name from dict_item a where  a.item_code=d.distribution_channel ) AS order_channel_new FROM order_sale_record d WHERE d.ordercode='%s' and d.state in (1,-1,2) order by d.create_time asc", param.OrderCode))
 	if !saleRes.IsEmpty() {
 	if !saleRes.IsEmpty() {
 		var (
 		var (
 			//最终业绩
 			//最终业绩

+ 55 - 0
internal/logic/order/serviceOpen.go

@@ -0,0 +1,55 @@
+package order
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
+	"jyOrderManager/internal/jyutil"
+	"jyOrderManager/internal/logic/product"
+	"jyOrderManager/internal/model"
+)
+
+func ServiceOpen(ctx context.Context, param model.OrderOpenServiceParams) error {
+	//查询订单
+	orderData, _ := g.DB().GetOne(ctx, fmt.Sprintf("select   * from  dataexport_order  where  order_code ='%s'", param.OrderCode))
+	if orderData.IsEmpty() {
+		return errors.New("为查询到订单信息")
+	}
+
+	if gconv.String(orderData.Map()["user_phone"]) != param.Phone {
+		g.DB().Update(ctx, "dataexport_order", map[string]interface{}{
+			"user_phone": param.Phone,
+		}, map[string]interface{}{
+			"order_code": param.OrderCode,
+		})
+	}
+	productDetail, err := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s'`, param.OrderCode))
+	if err != nil || productDetail.IsEmpty() {
+		return err
+	}
+	// 产品服务开通
+	for _, m := range productDetail.List() {
+		if !jyutil.IsServiceOpen(m) {
+			continue
+		}
+		//参数注入
+		m["phone"] = param.Phone
+		m["order_code"] = param.OrderCode
+		productCode := gconv.String(m["product_code"])
+		pFunc, err := product.JyProFunc.GetProductInitFuncByCode(productCode)
+		if err != nil {
+			return err
+		}
+		pObj, err := pFunc(m)
+		if err != nil {
+			return gerror.Wrap(err, fmt.Sprintf("获取%s商品异常", productCode))
+		}
+		if err := pObj.OpenService(ctx); err != nil {
+			return err
+		}
+	}
+	return nil
+}

+ 4 - 0
internal/model/orderParams.go

@@ -233,6 +233,10 @@ type (
 		OrderCode string `json:"orderCode"`
 		OrderCode string `json:"orderCode"`
 		Origin    string `json:"origin"`
 		Origin    string `json:"origin"`
 	}
 	}
+	OrderOpenServiceParams struct {
+		OrderCode string `json:"orderCode"`
+		Phone     string `json:"phone,omitempty"`
+	}
 )
 )
 
 
 // todo 备份
 // todo 备份