合并分支 'dev' 到 'test'

fix:修复小程序订单销售日期



查看合并请求 !26

@@ -52,9 +52,9 @@ spec:
           ports:
           ports:
             - containerPort: 8082
             - containerPort: 8082
             - containerPort: 443
             - containerPort: 443
-          volumeMounts:
-            - mountPath: /opt/logs
-              name: accesslogs
+#          volumeMounts:
+#            - mountPath: /opt/logs
+#              name: accesslogs
           env:
           env:
             - name: HTTP_PORT
             - name: HTTP_PORT
               value: "8082"
               value: "8082"
@@ -94,6 +94,6 @@ spec:
               value: "[partnermg_dev]"
               value: "[partnermg_dev]"
             - name: APP_NAME
             - name: APP_NAME
               value: ""
               value: ""
-      volumes:
-        - name: accesslogs
-          emptyDir: {}
+#      volumes:
+#        - name: accesslogs
+#          emptyDir: {}

@@ -49,9 +49,9 @@ spec:
           ports:
           ports:
             - containerPort: 8082
             - containerPort: 8082
             - containerPort: 443
             - containerPort: 443
-          volumeMounts:
-            - mountPath: /opt/logs
-              name: accesslogs
+#          volumeMounts:
+#            - mountPath: /opt/logs
+#              name: accesslogs
           env:
           env:
             - name: HTTP_PORT
             - name: HTTP_PORT
               value: "8082"
               value: "8082"
@@ -91,6 +91,6 @@ spec:
               value: "[partnermg_test]"
               value: "[partnermg_test]"
             - name: APP_NAME
             - name: APP_NAME
               value: "partnermg"
               value: "partnermg"
-      volumes:
-        - name: accesslogs
-          emptyDir: {}
+#      volumes:
+#        - name: accesslogs
+#          emptyDir: {}

@@ -265,6 +265,8 @@ func (s SyncOrderService) copyOrderBestshopToOrderBase(orderBestshop *domain.Ord
 	// 默认设定为事业合伙人订单
 	// 默认设定为事业合伙人订单
 	orderbase.PartnerCategory = domain.PartnerCategory{Id: 1, Name: "事业合伙人"}
 	orderbase.PartnerCategory = domain.PartnerCategory{Id: 1, Name: "事业合伙人"}
 	orderbase.Compute()
 	orderbase.Compute()
+	// 销售日期
+	orderbase.SaleDate = orderBestshop.CreateTime
 	err = orderBaseRepository.Save(&orderbase)
 	err = orderBaseRepository.Save(&orderbase)
 	if err != nil {
 	if err != nil {
 		e := fmt.Sprintf("添加order_base数据失败%s", err)
 		e := fmt.Sprintf("添加order_base数据失败%s", err)

@@ -21,7 +21,7 @@ type OrderBestShop struct {
 	BuyerAddress string `json:"buyerAddress"`
 	BuyerAddress string `json:"buyerAddress"`
 	//买家备注
 	//买家备注
 	BuyerRemark string `json:"buyerRemark"`
 	BuyerRemark string `json:"buyerRemark"`
-	//
+	//客户id
 	BuyerId int64 `json:"buyerId"`
 	BuyerId int64 `json:"buyerId"`
 	//商品总数
 	//商品总数
 	OrderCount int `json:"orderCount"`
 	OrderCount int `json:"orderCount"`
@@ -30,12 +30,16 @@ type OrderBestShop struct {
 	//发货时间
 	//发货时间
 	DeliveryTime string `json:"deliveryTime"`
 	DeliveryTime string `json:"deliveryTime"`
 	//创建时间
 	//创建时间
-	CreateTime time.Time           `json:"createTime"`
-	PartnerId  int64               `json:"partnerId"`
-	Goods      []OrderGoodBestShop `json:"goods"`
+	CreateTime time.Time `json:"createTime"`
+	//合伙人id
+	PartnerId int64 `json:"partnerId"`
+	//订单产品
+	Goods []OrderGoodBestShop `json:"goods"`
 	//是否将数据同步到 order_base ,order_good
 	//是否将数据同步到 order_base ,order_good
-	IsCopy    bool   `json:"isCopy"`
-	CompanyId int64  `json:"companyId"`
+	IsCopy bool `json:"isCopy"`
+	//公司id
+	CompanyId int64 `json:"companyId"`
+	//订单区域
 	OrderArea string `json:"orderArea"`
 	OrderArea string `json:"orderArea"`
 }
 }