From 749106f5d6e7fdb475680b0bcdedd53e6e08332a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 27 Mar 2023 09:55:35 +0800 Subject: [PATCH 1/4] 1 --- business/auth2/auth2.go | 2 +- controllers/auth2.go | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go index 64d843b4b..1ab4c6c7f 100644 --- a/business/auth2/auth2.go +++ b/business/auth2/auth2.go @@ -427,7 +427,7 @@ func AddAuthBindWithMobile(authInfo *AuthInfo, mobile string) (err error) { if handler := authers[authInfo.AuthBindInfo.Type]; handler != nil { user, err := dao.GetUserByID(dao.GetDB(), "mobile", mobile) if err != nil { - return errors.New("此接口有执行顺序，请先调用注册登录接口：【第一步：Login，第二不：TiktokDecrypt】") + return errors.New("此接口有执行顺序，请先调用注册登录接口：【第一步：Login，第二步：TiktokDecrypt】") } authInfo.AuthBindInfo.UserID = user.UserID //handler.UnbindAuth(user.GetID(), newAuthInfo.GetAuthType(), newAuthInfo.GetAuthTypeID(), user.GetName()) diff --git a/controllers/auth2.go b/controllers/auth2.go index 307d2543a..3410ddc21 100644 --- a/controllers/auth2.go +++ b/controllers/auth2.go @@ -100,7 +100,17 @@ func (c *Auth2Controller) SendVerifyCode() { func (c *Auth2Controller) TiktokDecrypt() { c.callTiktokDecrypt(func(params *tAuth2TiktokDecryptParams) (interface{}, string, error) { phone, err := auth2.DecryptUserMsg(params.SessionKey, params.Iv, params.Msg, params.LoginType) - return phone, "", err + isExist := false + if phone != "" { + if user, err := dao.GetUserByID(dao.GetDB(), "mobile", phone); err == nil { + if user != nil { + isExist = true + } else { + isExist = false + } + } + } + return map[string]interface{}{"mobile": phone, "isExist": isExist}, "", err }) } From 1c2785dd878f337128e3e69e1238e2e0426885e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 27 Mar 2023 15:45:17 +0800 Subject: [PATCH 2/4] 1 --- business/jxstore/cms/user2.go | 2 +- controllers/jx_order2.go | 57 +++++++++++++++++++++++++++ routers/commentsRouter_controllers.go | 10 ++++- 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index 99aac83e7..afbbf871d 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -229,7 +229,7 @@ func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVeri outAuthInfo, err = auth2.BindUser(inAuthInfo, user) } } else if dao.IsDuplicateError(err) { - if user.LastLoginType != "" && user.LastLoginType == alipay.AuthType { + if user.LastLoginType == alipay.AuthType { if user2, _ := dao.GetUserByID(dao.GetDB(), "mobile", user.GetMobile()); user2 != nil { user.UserID = user2.GetID() outAuthInfo, err = auth2.BindUser(inAuthInfo, user) diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go index f1c27be8b..1933ac07d 100644 --- a/controllers/jx_order2.go +++ b/controllers/jx_order2.go @@ -4,8 +4,10 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner/purchase/jx/localjx" "github.com/astaxie/beego/server/web" + "time" ) type JxOrderController struct { @@ -54,6 +56,61 @@ func (c *JxOrderController) Pay4Order() { }) } +// @Title 请求支付京西商城订单,门店自提订单 +// @Description 请求支付京西商城订单,门店自提订单 +// @Param token header string true "认证token" +// @Param subAppID formData string false "appID" +// @Param payType formData int true "支付类型" +// @Param vendorPayType formData string true "平台支付类型" +// @Param payMoney formData int true "自提支付金额" +// @Param storeId formData int true "提货门店id" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /Pay4StoreMyselfDeliverOrder [post] +func (c *JxOrderController) Pay4StoreMyselfDeliverOrder() { + c.callPay4StoreMyselfDeliverOrder(func(params *tJxorderPay4StoreMyselfDeliverOrderParams) (interface{}, string, error) { + orderDetail, _ := dao.GetStoreDetail(dao.GetDB(), params.StoreId, 0, "") + jxOrder := &localjx.JxOrderInfo{ + BuyerComment: "门店自提单", + StoreID: params.StoreId, + Skus: []*localjx.JxSkuInfo{ + &localjx.JxSkuInfo{ + SkuID: 8030743, + Count: params.PayMoney, + Price: 1, + SalePrice: 1, + Name: "自定义支付购买", + Weight: 1, + GroupSign: false, + DefendPrice: 0, + }, + }, + ExpectedDeliveredTimestamp: time.Now().Unix(), + TotalPrice: int64(params.PayMoney), + FreightPrice: 0, + OrderPrice: int64(params.PayMoney), + ActualPayPrice: int64(params.PayMoney), + OrderID: 0, + StoreName: orderDetail.Name, + Weight: 500, + FromStoreID: 0, + EarningType: model.EarningTypePoints, + OrderType: model.OrderTypeNormal, + IsBuyNowPrice: 0, + IsPriceDefend: 0, + OrderID2: "", + UserID: params.Ctx.GetUserID(), + } + outJxOrder, err := localjx.CreateOrder(params.Ctx, jxOrder, int64(142), 1, 0, true, nil) + if err != nil { + return nil, "", err + } + + retVal, err := localjx.Pay4Order(params.Ctx, outJxOrder.OrderID, params.PayType, params.VendorPayType, params.SubAppID) + return retVal, "", err + }) +} + // @Title 请求支付京西商城相关用户支付项目 // @Description 请求支付京西商城相关用户支付项目 // @Param token header string true "认证token" diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 98c2d0dbb..7a5c2d53b 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -910,7 +910,15 @@ func init() { web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"], web.ControllerComments{ Method: "Pay4Order", - Router: `/Pay4Order`, + Router: `4Order`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"], + web.ControllerComments{ + Method: "Pay4StoreMyselfDeliverOrder", + Router: `Pay4StoreMyselfDeliverOrder`, AllowHTTPMethods: []string{"post"}, MethodParams: param.Make(), Filters: nil, From b14e7640f23c09aec12a5f0af6f525b2fda38e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 27 Mar 2023 18:16:12 +0800 Subject: [PATCH 3/4] 1 --- business/jxstore/act/act.go | 16 +++++++++++----- business/jxstore/cms/sku.go | 10 +++++++++- business/jxstore/cms/store.go | 1 + globals/api/api.go | 1 + 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index 7e3c2bbd6..048b01f40 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -2035,12 +2035,18 @@ func RrefreshMtwmVendorAct(ctx *jxcontext.Context) (err error) { } // 查询门店爆款商品,当门店存在爆款时,取消之前的力荐商品,将新的爆款设置为力荐商品 //if k == mtwmapi.RetailActTypeSecKill && len(actList) > 0 { - // allActivityList := make([]string, 0, 0) // 此门店全部的折扣(爆款)活动商品 - // activationActivityList := make([]string, 0, 0) // 此门店全部的折扣(爆款)活动商品 + // allActivitySkuIdList := make([]string, 0, 0) // 此门店全部的折扣(爆款)活动商品 + // activationActivitySkuIdList := make([]string, 0, 0) // 此门店全部的折扣(爆款)活动商品 + // loseActivitySkuIdList := make([]string, 0, 0) // 此门店全部的折扣(爆款)活动商品 // for _, ac := range actList { - // allActivityList = append(allActivityList, utils.Int64ToStr(ac.ItemID)) - // if ac.Status == 1 { - // activationActivityList = append(activationActivityList, utils.Int64ToStr(ac.ItemID)) + // allActivitySkuIdList = append(allActivitySkuIdList, utils.Int64ToStr(ac.ItemID)) + // // 已经生效的爆款活动 + // if ac.Status == 1 && ac.SkuId != "" { + // activationActivitySkuIdList = append(activationActivitySkuIdList, utils.Int64ToStr(ac.ItemID)) + // } + // // 已经失效的爆款活动 + // if ac.Status == 0 && ac.SkuId != "" { + // loseActivitySkuIdList = append(loseActivitySkuIdList, ac.SkuId) // } // } // // 取消当前力荐商品 diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 9e83b5db3..eddd456e2 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1262,12 +1262,20 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n if payload["mtwmCategoryID"] != nil { mtwmCategoryID = payload["mtwmCategoryID"].(string) } - if payload["categoryID2"] != nil { + if payload["categoryID2"] != nil && !utils.IsNil(payload["categoryID2"]) { jxCategoryIDNumber, err := payload["categoryID2"].(json.Number).Int64() if err != nil { return false } jxCategoryID = int(jxCategoryIDNumber) + } else if payload["categoryID"] != nil && !utils.IsNil(payload["categoryID"]) { + jxCategoryIDNumber, err := payload["categoryID"].(json.Number).Int64() + if err != nil { + return false + } + jxCategoryID = int(jxCategoryIDNumber) + } else { + jxCategoryID = 0 } if jdCategoryId != "" { diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index d77849fc0..61189f6cc 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1762,6 +1762,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor panic(r) } }() + if isStoreMapNeedSync(vendorID, valid) { // 对于store vendor map，只有Status改变才需要同步到厂商 num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, storeMap, valid, userName, map[string]interface{}{ model.FieldStoreID: storeID, diff --git a/globals/api/api.go b/globals/api/api.go index 81bfcb7bb..f487c926b 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -268,6 +268,7 @@ func Init() { if WeixinMiniAppID3 = beego.AppConfig.DefaultString("weixinMiniAppID3", ""); WeixinMiniAppID3 != "" { WeixinApp = weixinapi.New(WeixinMiniAppID3, beego.AppConfig.DefaultString("weixinMiniSecret3", "")) } + WeixinApp2 = weixinapi.New("wxf3657c94aa01a3f0", "ce2b9c4cf991d72a09f67bab4d359015") // 暂时写死的 if WeixinMiniAppIDsc = beego.AppConfig.DefaultString("weixinMiniAppIDsc", ""); WeixinMiniAppIDsc != "" { From 1f531bd32f98eb77eda19fb60c3378eea3b92d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 27 Mar 2023 18:22:36 +0800 Subject: [PATCH 4/4] 1 --- business/jxstore/cms/sku.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index eddd456e2..43e6fc991 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1149,7 +1149,13 @@ type aa struct { // 根据名称获取商品分类[京东] func getCategoryByName(name string) string { handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) - vendorCategoryId, _ := handler.GetSkuCategoryIdByName("320406", name) + vendorOrgCode := "" + if beego.BConfig.RunMode == "jxgy" { + vendorOrgCode = "339032" + } else { + vendorOrgCode = "320406" + } + vendorCategoryId, _ := handler.GetSkuCategoryIdByName(vendorOrgCode, name) return vendorCategoryId } @@ -1163,7 +1169,13 @@ func getCategoryByImg(img ...string) string { imgs = append(imgs, v) } handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDDD).(partner.IPurchasePlatformStoreSkuHandler) - vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", strings.Join(imgs, "|")) + vendorOrgCode := "" + if beego.BConfig.RunMode == "jxgy" { + vendorOrgCode = "57939570" + } else { + vendorOrgCode = "57939570" + } + vendorCategoryId, _ := handler.GetSkuCategoryIdByName(vendorOrgCode, strings.Join(imgs, "|")) return vendorCategoryId }