Merge branch 'master' into dev

service/service_ly.go

@@ -331,6 +331,7 @@ func (ls *LyService) LyGoodsDetail(ctx context.Context, params RequestParams, go
 		has, limitStock := ls.getLimitStock(sku.GoodsId)
 		has, limitStock := ls.getLimitStock(sku.GoodsId)
 		if has {
 		if has {
 			sku.Stock = int64(limitStock)
 			sku.Stock = int64(limitStock)
+			sku.BatchSn = "" //如果存在指定库存，则批次是空
 		}
 		}
 		//计算按钮
 		//计算按钮
 		sku.LabelOp = activityService.GetLabelOp(sku)
 		sku.LabelOp = activityService.GetLabelOp(sku)

service/service_ly_common.go

@@ -351,6 +351,11 @@ func (ls *LyService) GetCoefficientAndPrice(sku model.LySku) model.LySku {
 						continue
 						continue
 					}
 					}
 				}
 				}
+				//如果有人民币的话,就用人民币,没有的话,就用上面的美元算出来的人民币
+				//L0018562一定有美元的,所以不能提前判断
+				if price.PriceCn != 0 {
+					priceCnNoTax = price.PriceCn
+				}
 				originalPrice = append(originalPrice, model.OriginPrice{
 				originalPrice = append(originalPrice, model.OriginPrice{
 					Purchases: price.Purchases,
 					Purchases: price.Purchases,
 					PriceCn:   c.MyRound(c.MulFloat(priceCnNoTax, tax), 4),
 					PriceCn:   c.MyRound(c.MulFloat(priceCnNoTax, tax), 4),