提交代码

internal/server/http/server.go

@@ -228,9 +228,15 @@ func submitOrder(c *bm.Context)  {
 		res       *gosoap.Response
 		res       *gosoap.Response
 	)
 	)
 
 
-	jsonByte, _ := json.Marshal(ErpSubmitImage)
+	jsonByte, err := json.Marshal(ErpSubmitImage)
+	if err != nil {
+		service.ErrorReturn(c,err.Error())
+	}
 
 
-	soap, err := gosoap.SoapClient(service.ErpConfig.ErpOrderRequestApi)
+	log.Info(string(jsonByte))
+
+
+	soap, err = gosoap.SoapClient(service.ErpConfig.ErpOrderRequestApi)
 	if err != nil {
 	if err != nil {
 		service.ErrorReturn(c,err.Error())
 		service.ErrorReturn(c,err.Error())
 	}
 	}

internal/service/db_select.go

@@ -46,6 +46,7 @@ func SelectOrderInfoFromOrderId(c *bm.Context,orderId string)([]model.OrderAllIn
 
 
 		currentOrderAllInfo.OrderInfo = orderInfo
 		currentOrderAllInfo.OrderInfo = orderInfo
 		currentOrderAllInfo.OrderInfo.OrderImageInfo = GetOrderEntryImage(c,orderInfo.Issuebillid,orderInfo.Issueentryid)
 		currentOrderAllInfo.OrderInfo.OrderImageInfo = GetOrderEntryImage(c,orderInfo.Issuebillid,orderInfo.Issueentryid)
+		currentOrderAllInfo.OrderImageInfo = currentOrderAllInfo.OrderInfo.OrderImageInfo
 		orderAllInfo = append(orderAllInfo, currentOrderAllInfo)
 		orderAllInfo = append(orderAllInfo, currentOrderAllInfo)
 	}
 	}
 
 
@@ -64,6 +65,9 @@ func GetOrderEntryImage(c *bm.Context,Issuebillid,Issueentryid string)([]model.O
 
 
 	var orderAllImage []model.OrderImage
 	var orderAllImage []model.OrderImage
 	imagerows,err := db.Query(c,"select issuebillid,issueentryid,image_src from lie_order_goods_img where issuebillid = ? and issueentryid = ? order by id desc limit 0,?",Issuebillid,Issueentryid,PhotoNum)
 	imagerows,err := db.Query(c,"select issuebillid,issueentryid,image_src from lie_order_goods_img where issuebillid = ? and issueentryid = ? order by id desc limit 0,?",Issuebillid,Issueentryid,PhotoNum)
+	if err != nil {
+		log.Error(err.Error())
+	}
 	defer imagerows.Close()
 	defer imagerows.Close()
 	for imagerows.Next() {
 	for imagerows.Next() {
 		var orderCurrentImage model.OrderImage
 		var orderCurrentImage model.OrderImage
@@ -71,6 +75,7 @@ func GetOrderEntryImage(c *bm.Context,Issuebillid,Issueentryid string)([]model.O
 			log.Error("scan demo log error(%v)", err)
 			log.Error("scan demo log error(%v)", err)
 			continue
 			continue
 		}
 		}
+
 		orderAllImage = append(orderAllImage,orderCurrentImage)
 		orderAllImage = append(orderAllImage,orderCurrentImage)
 	}
 	}