xg

src/jfw/modules/subscribepay/src/entity/order.go

@@ -132,7 +132,7 @@ func (this *commonOrderStruct) InserMap(product, productId, userid, lotteryId, d
 	case PDFPACK_MARKET, PDFPACK_BUYER, PDFPACK_WINNER: //pdf下载包
 		orderinfo, msg = pdfExportPackOrder(m, userid, product, productId)
 	case "投标企业信用报告":
-		orderinfo, msg = bidReportOrder(m, userid)
+		orderinfo, msg = bidReportOrder(m, userid, productId)
 	default:
 		orderinfo, msg = nil, "产品类型有误"
 	}
@@ -1380,11 +1380,11 @@ func newDataReportOrder(m map[string]interface{}, userId string) (*OrderInfo, st
 	}, ""
 }
 
-func bidReportOrder(m map[string]interface{}, userId string) (*OrderInfo, string) {
+func bidReportOrder(m map[string]interface{}, userId, productId string) (*OrderInfo, string) {
 	email := qu.ObjToString(m["email"])
 	phone := qu.ObjToString(m["order_phone"])
 	company := qu.ObjToString(m["company"])
-	if !jy.IsPhone(phone) || !EmailReg.MatchString(email) || company == "" {
+	if !EmailReg.MatchString(email) || company == "" {
 		return nil, "数据校验不通过"
 	}
 	//生成订单号
@@ -1399,8 +1399,12 @@ func bidReportOrder(m map[string]interface{}, userId string) (*OrderInfo, string
 		"phone":    order_phone,
 	}
 	filterStr, _ := json.Marshal(report)
+	packDetail, err := JyPdfExportPack.GetPdfPackDetail(productId)
+	if err != nil {
+		return nil, err.Error()
+	}
 	return &OrderInfo{
-		OrderMoney:    qu.IntAll(m["i_price"]),
+		OrderMoney:    packDetail.Price,
 		OrderStatus:   0,
 		ServiceStatus: 0,
 		UserPhone:     phone,