|
|
@@ -717,7 +717,7 @@ func CentralKitchenForSchoolReserveList(req md.CentralKitchenForSchoolReserveLis |
|
|
|
var m []*db.CentralKitchenForSchoolPackageOrdForReserveWithUserIdentity |
|
|
|
count, err = sess. |
|
|
|
Join("LEFT", "central_kitchen_for_school_package_ord", "central_kitchen_for_school_package_ord_for_reserve.out_trade_no = central_kitchen_for_school_package_ord.out_trade_no"). |
|
|
|
Join("LEFT", "user_identity", "central_kitchen_for_school_package_ord.user_identity_id = user_identity.id"). |
|
|
|
Join("LEFT", "user_identity", "central_kitchen_for_school_package_ord_for_reserve.user_identity_id = user_identity.id"). |
|
|
|
Join("LEFT", "enterprise", "enterprise.id = user_identity.enterprise_id"). |
|
|
|
Join("LEFT", "user", "user.id = user_identity.uid"). |
|
|
|
Join("LEFT", "class_with_user", "class_with_user.user_identity_id = user_identity.id"). |
|
|
@@ -735,7 +735,7 @@ func CentralKitchenForSchoolReserveList(req md.CentralKitchenForSchoolReserveLis |
|
|
|
EnterpriseName: v.Enterprise.Name, |
|
|
|
Uid: v.UserIdentity.Uid, |
|
|
|
UserIdentityId: v.UserIdentity.Id, |
|
|
|
UserIdentityName: v.CentralKitchenForSchoolPackageOrd.UserIdentityName, |
|
|
|
UserIdentityName: v.CentralKitchenForSchoolPackageOrdForReserve.UserIdentityName, |
|
|
|
Kind: v.CentralKitchenForSchoolPackageOrdForReserve.Kind, |
|
|
|
ReserveMonth: v.CentralKitchenForSchoolPackageOrdForReserve.ReserveMonth, |
|
|
|
TotalPrice: v.CentralKitchenForSchoolPackageOrdForReserve.TotalPrice, |
|
|
|