Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

business/jxcallback/orderman/order.go

@@ -4,11 +4,12 @@ import (
 	"crypto/md5"
 	"errors"
 	"fmt"
-	"git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
 	"math"
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
+
 	"git.rosy.net.cn/jx-callback/business/authz/autils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/excel"
 	"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"

business/partner/purchase/im/im.go

@@ -359,8 +359,10 @@ var rel = map[int]string{
 func DecryptIm(appID int, msg string) (string, error) {
 	data, _ := base64.StdEncoding.DecodeString(msg)
 	key := utils.LimitUTF8StringLen2(rel[appID], 16)
-	res, err := utils.AESCBC16Decrypt(data, []byte(key), []byte(key))
+	res, err := utils.AESCBCDecpryt(data, []byte(key), []byte(key))
+	globals.SugarLogger.Debugf("DecryptIm err=%v", err)
 	if len(string(res)) > 0 && err == nil {
+		globals.SugarLogger.Debugf("DecryptIm res=%v", string(res))
 		return string(res), nil
 	}
 	return "", err

business/partner/purchase/im/im_model.go

@@ -51,5 +51,5 @@ var (
 )
 
 const (
-	ExpireTimeDay = 4 * time.Hour //redis过期时间
+	ExpireTimeDay = 6 * time.Hour //redis过期时间
 )

business/partner/purchase/tao_vegetable/act.go

@@ -86,9 +86,6 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle
 			actData = &domain.AlibabaRetailMarketingItemdiscountActivitySkuAddItemDiscountActivityElementOperateRequest{
 				SkuElements: &[]domain.AlibabaRetailMarketingItemdiscountActivitySkuAddSkuActivityElementDto{{
 					SkuCode: utils.String2Pointer(utils.Int2Str(v.SkuID)),
-					//FixPriceMoney: &fixPriceMoney,
-					//DiscountRate:  &discountRate,
-					//DecreaseMoney: &decreaseMoney,
 					Limit: &domain.AlibabaRetailMarketingItemdiscountActivitySkuAddLimitDto{
 						TotalLimitCnt:      &stock,
 						DailyTotalLimitCnt: &limitDaily,
@@ -103,7 +100,6 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle
 			}
 
 			sType := actType2Txd(act.Type)
-			globals.SugarLogger.Debugf("sType=%d", sType)
 			switch sType {
 			case tao_vegetable.DiscountTypeDeductMoney:
 				decreaseMoney = v.VendorPrice - v.ActualActPrice
@@ -158,7 +154,6 @@ func actSku2Delete(actIDs []string, vendorOrgCode, vendorStoreID string) (map[st
 	)
 	for _, v := range actIDs {
 		i := utils.Str2Int64(v)
-		//if skus, err := api.TaoVegetableApi.ActivitySkuQuery(i); err == nil {
 		if skus, err := getAPI(vendorOrgCode, 0, vendorStoreID).ActivitySkuQuery(i); err == nil {
 			//查询商品
 			for _, sku := range skus {
@@ -194,7 +189,6 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
 
 	if actData != nil && actSkuData != nil {
 		if globals.EnableMtwmStoreWrite {
-			globals.SugarLogger.Debugf("进入创建活动")
 			//创建活动
 			actData.StoreIds = &[]string{vendorStoreID}
 			actID, err1 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityCreate(*actData)
@@ -204,7 +198,6 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
 					ErrMsg:    fmt.Sprintf("%v", err1),
 					StoreID:   int(utils.Str2Int64WithDefault(vendorStoreID, 0)),
 				})
-				globals.SugarLogger.Debugf("我在failedList=%s", utils.Format4Output(failedList, false), err1)
 				return failedList, err1
 			}
 			//活动增加商品
@@ -212,8 +205,9 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
 			err3, successSkuCode, failSkuCode := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivitySkuCreate(*actSkuData)
 			err = err3
 			if err != nil { //商品新增失败，回滚删除创建的活动
-				err4 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityDelete(*actData.CreatorId, *actData.CreatorName, actID)
+				if err4 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityDelete(*actData.CreatorId, *actData.CreatorName, actID); err != nil {
-				globals.SugarLogger.Debugf("createOneShopAct rollback delete act err=%v", err4)
+					return nil, fmt.Errorf("活动创建但新增商品失败，删除活动错误：%v，请在淘鲜达平台删除此活动", err4)
+				}
 			}
 			actStoreSkuMap := make(map[int]*model.ActStoreSku2)
 			for _, v := range actStoreSku {
@@ -349,7 +343,6 @@ func (c *PurchaseHandler) SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITa
 				updateItems = append(updateItems, partner.Act2Update(ctx, act, model.SyncFlagModifiedMask))
 			}
 		} else if model.IsSyncStatusNew(act.SyncStatus) {
-			globals.SugarLogger.Debugf("我进入这里了createSkuAct")
 			createdList, err2 := createSkuAct(ctx, nil, act, actStoreSkuList4Create)
 			updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, createdList, model.SyncFlagNewMask)...)
 			if err = err2; err == nil {

business/partner/purchase/tao_vegetable/store.go

@@ -12,8 +12,6 @@ import (
 
 	"git.rosy.net.cn/baseapi/utils/errlist"
 
-	"git.rosy.net.cn/jx-callback/globals/api"
-
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxstore/event"
@@ -85,12 +83,13 @@ type Point struct {
 }
 
 // UpdateTxdStore 单独更新淘鲜达门店营业时间/状态 销售范围
-func UpdateTxdStore(store TxdStore) (err error) {
+func UpdateTxdStore(store TxdStore, vendorOrgCode string) (err error) {
+	a := getAPI(vendorOrgCode, 0, "")
 	errList := errlist.New()
 	for _, v := range store.Flag {
 		switch v {
 		case FlagStatus:
-			if err = api.TaoVegetableApi.ShopUpdateStatus(store.TxdStoreID, store.Status); err != nil {
+			if err = a.ShopUpdateStatus(store.TxdStoreID, store.Status); err != nil {
 				errList.AddErr(fmt.Errorf("营业状态：%v", err))
 			}
 		case FlagBusinessTime:
@@ -98,7 +97,7 @@ func UpdateTxdStore(store TxdStore) (err error) {
 				return errors.New("更新营业时间，时间必填")
 			}
 			if CheckBusinessTime(store.StartTime, store.EndTime) {
-				if err = api.TaoVegetableApi.ShopUpdateInfo(store.TxdStoreID, store.StartTime, store.EndTime); err != nil {
+				if err = a.ShopUpdateInfo(store.TxdStoreID, store.StartTime, store.EndTime); err != nil {
 					errList.AddErr(fmt.Errorf("营业时间：%v", err))
 				}
 			}
@@ -107,7 +106,7 @@ func UpdateTxdStore(store TxdStore) (err error) {
 				return errors.New("更新营业范围，坐标必填")
 			}
 			point := GetPoints(store.Points)
-			if err = api.TaoVegetableApi.ShopUpdateRange(store.TxdStoreID, point); err != nil {
+			if err = a.ShopUpdateRange(store.TxdStoreID, point); err != nil {
 				errList.AddErr(fmt.Errorf("营业范围：%v", err))
 			}
 		default:

controllers/cms_store.go

@@ -1682,6 +1682,7 @@ func (c *StoreController) SingleBindTaoVegetable() {
 // @Title 更新淘鲜达门店信息
 // @Description 更新淘鲜达门店信息
 // @Param	token			header		string	    true	"认证token"
+// @Param	vendorOrgCode	formData	string	    true	"平台账号"
 // @Param	txdStores       formData	string		true	"TxdStore"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
@@ -1692,7 +1693,7 @@ func (c *StoreController) UpdateTxdStore() {
 		b := bytes.NewBufferString(params.TxdStores)
 		decoder := json.NewDecoder(b)
 		if err = decoder.Decode(&taoStore); err == nil {
-			err = tao_vegetable.UpdateTxdStore(taoStore)
+			err = tao_vegetable.UpdateTxdStore(taoStore, params.VendorOrgCode)
 		}
 		return nil, "", err
 	})