Inicio Explorar Axuda
Iniciar sesión
k.zhang
/
duoduo
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Merge branch 'develop' of k.zhang/duoduo into master

k.zhang %!s(int64=4) %!d(string=hai) anos
pai
4a1b01dcaa 56f4a9da04
achega
fa669162ca
Modificáronse 2 ficheiros con 4 adicións e 4 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 2 2
      apis/pdd/pdd.ddk.order.list.increment.get.go
  2. 2 2
      report/pdd.ddk.order.list.increment.get.go

+ 2 - 2
apis/pdd/pdd.ddk.order.list.increment.get.go
Ver ficheiro 

@@ -96,8 +96,8 @@ func PddDdkOrderListIncrementGet(c *gin.Context) {
 
 			sqlData.JSONData, _ = tools.JsonMarshal(&outData.OrderListGetResponse.OrderList[i])
 
 			sqlData.OrderCreateTime = tools.TimeToStr(outData.OrderListGetResponse.OrderList[i].OrderCreateTime)
 
 			sqlData.OrderSn = outData.OrderListGetResponse.OrderList[i].OrderSn
 
-			sqlData.Amount = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.005))
 
-			sqlData.Amount1 = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.0015))
 
+			sqlData.Amount = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.006))
 
+			sqlData.Amount1 = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.001))
 
 			sqlData.Amount2 = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.001))
 
 			sqlData.OrderAmount = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].OrderAmount).Div(decimal.NewFromInt(100))

+ 2 - 2
report/pdd.ddk.order.list.increment.get.go
Ver ficheiro 

@@ -87,8 +87,8 @@ func DdkOrder() {
 
 			sqlData.JSONData, _ = tools.JsonMarshal(&outData.OrderListGetResponse.OrderList[i])
 
 			sqlData.OrderCreateTime = tools.TimeToStr(outData.OrderListGetResponse.OrderList[i].OrderCreateTime)
 
 			sqlData.OrderSn = outData.OrderListGetResponse.OrderList[i].OrderSn
 
-			sqlData.Amount = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.005))
 
-			sqlData.Amount1 = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.0015))
 
+			sqlData.Amount = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.006))
 
+			sqlData.Amount1 = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.001))
 
 			sqlData.Amount1 = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].PromotionAmount).Mul(decimal.NewFromFloat(0.001))
 
 			sqlData.OrderAmount = decimal.NewFromInt(outData.OrderListGetResponse.OrderList[i].OrderAmount).Div(decimal.NewFromInt(100))