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

business/jxstore/cms/store_sku.go

@@ -2560,7 +2560,7 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID int, toStoreIDs []int, co
 			t1.jd_sync_status = t1.jd_sync_status | ?,
 			t1.mtwm_sync_status = t1.mtwm_sync_status | ?,
 			t1.ebai_sync_status = t1.ebai_sync_status | ?,
-			t1.dd_sync_status = t1.dd_sync_status | ?,
+			t1.dd_sync_status = t1.dd_sync_status | ? 
 		WHERE t1.store_id = ? AND t1.deleted_at = ?
 		`
 			sqlParams := []interface{}{
@@ -2676,7 +2676,7 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID int, toStoreIDs []int, co
 		t1.jd_sync_status = t1.jd_sync_status | ?,
 		t1.mtwm_sync_status = t1.mtwm_sync_status | ?,
 		t1.ebai_sync_status = t1.ebai_sync_status | ?,
-		t1.dd_sync_status = t1.dd_sync_status | ?,
+		t1.dd_sync_status = t1.dd_sync_status | ? ,
 		t1.stock = t0.stock 
 	WHERE t1.store_id = ? AND t1.deleted_at = ? AND t0.id IS NOT NULL
 	`

business/partner/printer/feie/feie.go

@@ -117,10 +117,8 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
 <BR>
 更多信息请关注官方微信: %s<BR>
 <BR>
-<BR><BR>
 --------------------------------<BR>
 --------------------------------<BR>
-<BR><BR>
 `
 	// <QR>http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk</QR>
 	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel, globals.StoreName)
@@ -208,10 +206,8 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
 <BR>
 <B>更多信息请关注官方微信: %s<BR></B>
 <BR>
-<BR><BR>
 --------------------------------<BR>
 --------------------------------<BR>
-<BR><BR>
 `
 	// <QR>http://weixin.qq.com/r/tkkDGzTERmk5rXB49xyk</QR>
 	orderParams = append(orderParams, order.SkuCount, order.GoodsCount, order.StoreName, storeTel, globals.StoreName)

business/partner/purchase/tiktok_store/store_sku2_utils.go

@@ -134,7 +134,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 				continue
 			}
 			param := &product_addV2_request.ProductAddV2Param{
-				Name:             utils.LimitUTF8StringLen(storeSku.SkuName, mtwmapi.MaxSkuNameCharCount),
+				Name:             utils.LimitUTF8StringLen(storeSku.SkuName, mtwmapi.MaxSkuNameCharCount*2),
 				PayType:          tiktokShop.TiktokPayType1,
 				ReduceType:       tiktokShop.SkuReduceTypePayMakeOrder,
 				Weight:           utils.Int2Float64(storeSku.Weight),