1

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"
@@ -2442,8 +2443,8 @@ func DelOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID, id
 	`
 	sqlParams := []interface{}{vendorOrderID}
 	dao.GetRows(db, &orderSkus, sql, sqlParams)
-	if len(orderSkus) < 5 {
+	if len(orderSkus) < 3 {
-		return 0, fmt.Errorf("商品数小于5，不允许删除！")
+		return 0, fmt.Errorf("商品数小于3，不允许删除！")
 	}
 	if orderSkus[0].ID == int64(id) {
 		//if orderSkus[0].JxSkuID == skuID {

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

@@ -77,7 +77,6 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle
 	}
 
 	for _, v := range actStoreSku {
-		globals.SugarLogger.Debugf("打印初始商品参数 sku=%s", utils.Format4Output(v, false))
 		if handler == nil || handler(v.SyncStatus) {
 			stock := int64(0)
 			if v.Stock > 0 {
@@ -87,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,
@@ -104,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
@@ -159,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 {
@@ -192,32 +186,28 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
 	actData := act2TxdActivity(act)
 	//2 活动商品详情
 	actSkuData := storeSku2ActData(act, actStoreSku, isCreateOrUpdate)
-	globals.SugarLogger.Debugf("进入获取活动参数,actData=%s,actSkuData=%s", utils.Format4Output(actData, false), utils.Format4Output(actSkuData, false))
 
 	if actData != nil && actSkuData != nil {
 		if globals.EnableMtwmStoreWrite {
-			globals.SugarLogger.Debugf("进入创建活动")
 			//创建活动
 			actData.StoreIds = &[]string{vendorStoreID}
 			actID, err1 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityCreate(*actData)
-			globals.SugarLogger.Debugf("createOneShopAct actData=%s,err=%v", utils.Format4Output(actData, false), err1)
 			if err1 != nil || actID == 0 {
 				failedList = append(failedList, &partner.StoreSkuInfoWithErr{
 					VendoreID: model.VendorIDTaoVegetable,
 					ErrMsg:    fmt.Sprintf("%v", err1),
 					StoreID:   int(utils.Str2Int64WithDefault(vendorStoreID, 0)),
 				})
-				globals.SugarLogger.Debugf("我在failedList=%s", utils.Format4Output(failedList, false), err1)
 				return failedList, err1
 			}
 			//活动增加商品
 			actSkuData.ActId = &actID
 			err3, successSkuCode, failSkuCode := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivitySkuCreate(*actSkuData)
-			globals.SugarLogger.Debugf("createOneShopAct actSkuData=%s,err3=%v", utils.Format4Output(actSkuData, false), err3)
 			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 {
@@ -295,12 +285,9 @@ func createSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.A
 	task := tasksch.NewParallelTask("txd createSkuAct", nil, ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			list := batchItemList[0].([]*model.ActStoreSku2)
-			globals.SugarLogger.Debugf("我在这里4")
 			failedList, err2 := createOneShopAct(act, list[0].VendorStoreID, list)
-			globals.SugarLogger.Debugf("我在这里6，failedList=%s, err2=%v", utils.Format4Output(failedList, false), err2)
 			if err = err2; err2 == nil {
 				if len(failedList) > 0 {
-					globals.SugarLogger.Debugf("我在这里5")
 					failedMap := putils.StoreSkuInfoWithErrList2MapBySku(failedList)
 					list = []*model.ActStoreSku2{}
 					for _, v := range actStoreSku {
@@ -356,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 {