物料订单配送费测试

business/jxstore/cms/store_sku.go

@@ -1178,6 +1178,15 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 										skuBind.StatusSaleEnd = skuBindInfo.StatusSaleEnd
 									}
 								}
+								if skuBindInfo.StatusSaleBegin == 0 && skuBindInfo.StatusSaleEnd == 0 {
+									if skuBind.StatusSaleBegin != skuBindInfo.StatusSaleBegin || skuBind.StatusSaleEnd != skuBindInfo.StatusSaleEnd {
+										updateFieldMap["StatusSaleBegin"] = 1
+										updateFieldMap["StatusSaleEnd"] = 1
+									}
+									skuBind.StatusSaleBegin = skuBindInfo.StatusSaleBegin
+									skuBind.StatusSaleEnd = skuBindInfo.StatusSaleEnd
+								}
+
 								if globals.IsAddEvent {
 									if len(updateFieldMap) > 0 {
 										mapAfter := refutil.FindMapAndStructMixed(updateFieldMap, skuBind)

business/partner/purchase/jx/localjx/order.go

@@ -659,6 +659,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 							}
 						}
 						outJxOrder.Weight += jxSku.Count * jxSku.Weight
+						jxOrder.Weight += jxSku.Count * jxSku.Weight
 					}
 				}
 			}
@@ -1496,7 +1497,6 @@ func tryToSplitMatterOrder(jxOrder *JxOrderInfo) (outOrders []*JxOrderInfo, frei
 	//但是我把JxSkuInfo放进list的时候，想根据一个参数GroupSign判断是否这个商品已经分出去了
 	//但是在list中同一个商品通过以下方式放进去的地址是一样的，我改了一个商品的GroupSign，所有的都变了，所以只有分出一个JxSkuInfo2去弄。。
 	//要做优化的话更好
-	fmt.Println("skus", utils.Format4Output(skus, false))
 	for _, v := range skus {
 		for i := 0; i < v.Count; i++ {
 			var sku2 = &JxSkuInfo2{}